celerp 2.3.0__tar.gz → 2.3.2__tar.gz

{celerp-2.3.0 → celerp-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celerp
-Version: 2.3.0
+Version: 2.3.2
 Summary: Free, self-hosted ERP for small businesses
 License: Business Source License 1.1
         

{celerp-2.3.0 → celerp-2.3.2}/celerp/events/schemas.py

@@ -5,7 +5,18 @@ from __future__ import annotations
 
 from typing import Any
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, model_validator
+
+# The SKU/barcode write-time predicates live in celerp.inventory_codes so the event
+# boundary, the interactive routes, the allocation service, and the scanner share one
+# source of truth. reject_comma_sku/SKU_COMMA_MESSAGE are re-exported here because
+# celerp_inventory.routes imports them from this module.
+from celerp.inventory_codes import (  # noqa: F401 - re-exported for celerp_inventory
+    SKU_COMMA_MESSAGE,
+    reject_comma_sku,
+    validate_barcode,
+    validate_sku,
+)
 
 
 # -----------------
@@ -13,7 +24,27 @@ from pydantic import BaseModel, Field
 # -----------------
 
 
-class ItemCreated(BaseModel):
+class _SkuGuard(BaseModel):
+    """Mixin: enforce the SKU and barcode invariants on any item event that sets them.
+
+    SKU: no comma (Celerp's OR operator in the SKU/search syntax) and a bounded length.
+    Barcode: digits only and a bounded length. These are the canonical write-time
+    predicates; interactive routes wrap them to surface a friendly 422, every other
+    emitter hits them here at the event boundary (imports, connector upserts, document
+    receiving). Replay never runs these schemas (the reducer does), so enforcing here
+    can never brick a historical projection.
+    """
+
+    @model_validator(mode="before")
+    @classmethod
+    def _guard_item_codes(cls, data: Any) -> Any:
+        if isinstance(data, dict):
+            validate_sku(data.get("sku"))
+            validate_barcode(data.get("barcode"))
+        return data
+
+
+class ItemCreated(_SkuGuard):
     sku: str
     name: str
     quantity: float = 0
@@ -28,7 +59,7 @@ class ItemCreated(BaseModel):
     model_config = {"extra": "allow"}
 
 
-class ItemSnapshot(BaseModel):
+class ItemSnapshot(_SkuGuard):
     """Snapshot of full item state - used for imports. sku/name optional (absent in some sources)."""
 
     sku: str | None = None
@@ -53,6 +84,14 @@ class ItemSnapshot(BaseModel):
 class ItemUpdated(BaseModel):
     fields_changed: dict[str, dict[str, Any]]
 
+    @model_validator(mode="after")
+    def _guard_item_codes(self) -> "ItemUpdated":
+        if "sku" in self.fields_changed:
+            validate_sku((self.fields_changed.get("sku") or {}).get("new"))
+        if "barcode" in self.fields_changed:
+            validate_barcode((self.fields_changed.get("barcode") or {}).get("new"))
+        return self
+
 
 class ItemPricingSet(BaseModel):
     price_type: str
@@ -188,7 +227,7 @@ class ItemMerged(BaseModel):
     source_entity_ids: list[str]
 
 
-class ItemPatched(BaseModel):
+class ItemPatched(_SkuGuard):
     """CSV upsert patch: accepts any item data fields."""
     model_config = {"extra": "allow"}
 

celerp-2.3.2/celerp/inventory_codes.py

@@ -0,0 +1,87 @@
+# Copyright (c) 2026 Noah Severs
+# SPDX-License-Identifier: BUSL-1.1
+
+"""Canonical inventory code limits and validation - one source of truth.
+
+The SKU/barcode invariants live here so the event boundary (celerp.events.schemas),
+the interactive inventory routes, the allocation service, and the scanner all share
+the exact same rules. A comma is Celerp's OR operator in the SKU/search syntax, so a
+SKU may never contain one (it would split into separate codes wherever SKUs are
+matched). A barcode is a numeric physical-lot identifier and must be unique per
+company - enforced at the event boundary (format) and by a partial unique index on
+the projections table (uniqueness).
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+MAX_BARCODE_LEN = 64
+MAX_SKU_LEN = 255
+MAX_SCAN_CODE_LEN = max(MAX_BARCODE_LEN, MAX_SKU_LEN)
+
+# Partial unique index enforcing at-most-one item per (company, barcode). Declared on
+# the Projection model so create_all builds it for the test schema, and created on
+# existing databases by the barcode-uniqueness migration. Named here so the applier
+# can tell a barcode violation apart from the (company_id, entity_id) primary-key race.
+BARCODE_UNIQUE_INDEX = "uq_projection_company_item_barcode"
+
+SKU_COMMA_MESSAGE = "SKU cannot contain a comma"
+SKU_TOO_LONG_MESSAGE = f"SKU cannot exceed {MAX_SKU_LEN} characters"
+BARCODE_NOT_DIGITS_MESSAGE = "Barcode must contain only digits"
+BARCODE_TOO_LONG_MESSAGE = f"Barcode cannot exceed {MAX_BARCODE_LEN} characters"
+BARCODE_CONFLICT_MESSAGE = "Barcode '{barcode}' already exists"
+
+
+def reject_comma_sku(sku: Any) -> Any:
+    """Reject a comma-bearing SKU. Returns the sku for chaining."""
+    if sku is not None and "," in str(sku):
+        raise ValueError(SKU_COMMA_MESSAGE)
+    return sku
+
+
+def validate_sku(sku: Any) -> Any:
+    """Reject a comma-bearing or over-long SKU. Returns the sku for chaining."""
+    reject_comma_sku(sku)
+    if sku is not None and len(str(sku)) > MAX_SKU_LEN:
+        raise ValueError(SKU_TOO_LONG_MESSAGE)
+    return sku
+
+
+def validate_barcode(barcode: Any) -> Any:
+    """Reject a non-digit or over-long barcode. An absent/empty barcode is allowed."""
+    if barcode is None:
+        return barcode
+    s = str(barcode)
+    if s == "":
+        return barcode
+    if not s.isdigit():
+        raise ValueError(BARCODE_NOT_DIGITS_MESSAGE)
+    if len(s) > MAX_BARCODE_LEN:
+        raise ValueError(BARCODE_TOO_LONG_MESSAGE)
+    return barcode
+
+
+class BarcodeConflictError(Exception):
+    """A write violated the (company, item, barcode) uniqueness invariant.
+
+    Raised by the projection applier when the DB unique index rejects an insert - the
+    final defense for any writer that bypasses the application lock (imports,
+    connectors, a future writer). The API layer maps it to 409.
+    """
+
+    def __init__(self, barcode: str | None = None):
+        self.barcode = barcode
+        super().__init__(
+            BARCODE_CONFLICT_MESSAGE.format(barcode=barcode) if barcode else "Barcode already exists"
+        )
+
+
+def is_barcode_unique_violation(exc: Exception) -> bool:
+    """True when an IntegrityError is the barcode unique-index violation (not the PK race)."""
+    orig = getattr(exc, "orig", None)
+    if getattr(orig, "constraint_name", None) == BARCODE_UNIQUE_INDEX:
+        return True
+    # Expression-index violations do not always populate constraint_name across drivers;
+    # the index name still appears in the server message.
+    return BARCODE_UNIQUE_INDEX in str(exc)

{celerp-2.3.0 → celerp-2.3.2}/celerp/main.py

@@ -13,6 +13,7 @@ from slowapi.errors import RateLimitExceeded
 from slowapi.util import get_remote_address
 
 from celerp.db import engine, mask_db_credentials
+from celerp.inventory_codes import BarcodeConflictError
 from celerp.config import settings, assert_secure_jwt, ensure_instance_id, load_cloud_config, load_backup_config
 load_cloud_config()
 load_backup_config()
@@ -447,6 +448,14 @@ async def rate_limit_handler(_request: Request, _exc: RateLimitExceeded):
     return JSONResponse(status_code=429, content={"detail": "Rate limit exceeded"})
 
 
+@app.exception_handler(BarcodeConflictError)
+async def barcode_conflict_handler(_request: Request, exc: BarcodeConflictError):
+    # The projection applier raises this when the barcode unique index rejects a write
+    # that bypassed the allocation lock (imports, connectors). A more specific handler
+    # than the Exception catch-all, so it maps to 409 instead of a masked 500.
+    return JSONResponse(status_code=409, content={"detail": str(exc)})
+
+
 # Kernel routes — always present regardless of module configuration
 app.include_router(health.router, tags=["system"])
 app.include_router(auth.router, prefix="/auth", tags=["auth"])

celerp-2.3.2/celerp/migrations/versions/bc0d1e2f3a4b_barcode_unique_index.py

@@ -0,0 +1,119 @@
+# Copyright (c) 2026 Noah Severs
+# SPDX-License-Identifier: BUSL-1.1
+
+"""Enforce at-most-one item per (company, barcode) with a partial unique index.
+
+Revision ID: bc0d1e2f3a4b
+Revises: b3c4d5e6f7a8
+Create Date: 2026-08-25
+
+Context
+-------
+A barcode identifies at most one physical-lot item per company. Until now that was
+only enforced by an application check under a lock; any writer bypassing the lock
+(imports, connectors, a future writer) could create duplicates, and legacy databases
+may already hold some.
+
+This migration is the final defense: a PostgreSQL partial expression unique index on
+``(company_id, state ->> 'barcode')`` for item projections with a non-empty barcode.
+
+It refuses to create the index while incompatible data exists rather than silently
+renaming or clearing anything. A preflight scans for duplicate non-empty barcodes,
+barcodes over the length limit, SKUs over the length limit, and comma-bearing SKUs,
+and stops with an actionable report (company, value, affected entity ids) so an
+operator can remediate and re-run.
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+from alembic import op
+
+from celerp.inventory_codes import BARCODE_UNIQUE_INDEX, MAX_BARCODE_LEN, MAX_SKU_LEN
+
+revision = "bc0d1e2f3a4b"
+down_revision = "b3c4d5e6f7a8"
+branch_labels = None
+depends_on = None
+
+
+def _preflight(conn) -> list[str]:
+    """Return a list of human-readable remediation problems; empty means clean."""
+    problems: list[str] = []
+
+    dups = conn.execute(
+        sa.text(
+            "SELECT company_id, state ->> 'barcode' AS barcode, "
+            "       array_agg(entity_id ORDER BY entity_id) AS entities "
+            "FROM projections "
+            "WHERE entity_type = 'item' AND NULLIF(state ->> 'barcode', '') IS NOT NULL "
+            "GROUP BY company_id, state ->> 'barcode' "
+            "HAVING count(*) > 1"
+        )
+    ).fetchall()
+    for row in dups:
+        problems.append(
+            f"duplicate barcode {row.barcode!r} in company {row.company_id}: entities {list(row.entities)}"
+        )
+
+    long_barcodes = conn.execute(
+        sa.text(
+            "SELECT company_id, entity_id, state ->> 'barcode' AS barcode "
+            "FROM projections "
+            "WHERE entity_type = 'item' AND length(state ->> 'barcode') > :n"
+        ),
+        {"n": MAX_BARCODE_LEN},
+    ).fetchall()
+    for row in long_barcodes:
+        problems.append(
+            f"barcode {row.barcode!r} over {MAX_BARCODE_LEN} chars in company {row.company_id} entity {row.entity_id}"
+        )
+
+    long_skus = conn.execute(
+        sa.text(
+            "SELECT company_id, entity_id "
+            "FROM projections "
+            "WHERE entity_type = 'item' AND length(state ->> 'sku') > :n"
+        ),
+        {"n": MAX_SKU_LEN},
+    ).fetchall()
+    for row in long_skus:
+        problems.append(
+            f"SKU over {MAX_SKU_LEN} chars in company {row.company_id} entity {row.entity_id}"
+        )
+
+    comma_skus = conn.execute(
+        sa.text(
+            "SELECT company_id, entity_id, state ->> 'sku' AS sku "
+            "FROM projections "
+            "WHERE entity_type = 'item' AND position(',' in state ->> 'sku') > 0"
+        )
+    ).fetchall()
+    for row in comma_skus:
+        problems.append(
+            f"comma-bearing SKU {row.sku!r} in company {row.company_id} entity {row.entity_id}"
+        )
+
+    return problems
+
+
+def upgrade() -> None:
+    conn = op.get_bind()
+
+    problems = _preflight(conn)
+    if problems:
+        raise RuntimeError(
+            "Cannot create the barcode uniqueness index: incompatible item data exists. "
+            "Resolve each of the following (rename or clear the barcode/SKU on the affected "
+            "items), then re-run the migration:\n  - " + "\n  - ".join(problems)
+        )
+
+    op.execute(
+        f"CREATE UNIQUE INDEX IF NOT EXISTS {BARCODE_UNIQUE_INDEX} "
+        "ON projections (company_id, (state ->> 'barcode')) "
+        "WHERE entity_type = 'item' AND NULLIF(state ->> 'barcode', '') IS NOT NULL"
+    )
+
+
+def downgrade() -> None:
+    op.execute(f"DROP INDEX IF EXISTS {BARCODE_UNIQUE_INDEX}")

{celerp-2.3.0 → celerp-2.3.2}/celerp/models/projections.py

@@ -9,12 +9,27 @@ import sqlalchemy as sa
 from sqlalchemy import BigInteger, Boolean, DateTime, ForeignKey, PrimaryKeyConstraint, String, Text
 from sqlalchemy.orm import Mapped, mapped_column
 
+from celerp.inventory_codes import BARCODE_UNIQUE_INDEX
 from celerp.models.base import Base
 
 
 class Projection(Base):
     __tablename__ = "projections"
-    __table_args__ = (PrimaryKeyConstraint("company_id", "entity_id"),)
+    __table_args__ = (
+        PrimaryKeyConstraint("company_id", "entity_id"),
+        # At most one item per (company, non-empty barcode). The final defense behind
+        # the application allocation lock: imports, connectors, or a future writer that
+        # bypasses the lock still cannot create a duplicate barcode. Declared here so
+        # create_all builds it for the test schema; created on existing databases by the
+        # barcode-uniqueness migration.
+        sa.Index(
+            BARCODE_UNIQUE_INDEX,
+            "company_id",
+            sa.text("(state ->> 'barcode')"),
+            unique=True,
+            postgresql_where=sa.text("entity_type = 'item' AND NULLIF(state ->> 'barcode', '') IS NOT NULL"),
+        ),
+    )
 
     entity_id: Mapped[str] = mapped_column(Text, nullable=False)
     company_id: Mapped[uuid.UUID] = mapped_column(sa.Uuid(as_uuid=True), ForeignKey("companies.id"), nullable=False)

{celerp-2.3.0 → celerp-2.3.2}/celerp/projections/engine.py

@@ -10,6 +10,7 @@ from datetime import datetime, timezone
 from sqlalchemy import delete, select
 from sqlalchemy.exc import IntegrityError
 
+from celerp.inventory_codes import BarcodeConflictError, is_barcode_unique_violation
 from celerp.models.ledger import LedgerEntry
 from celerp.models.projections import Projection
 
@@ -130,10 +131,33 @@ class ProjectionEngine:
                     )
                     await session.flush()
                 return
-            except IntegrityError:
+            except IntegrityError as exc:
+                # Only the (company_id, entity_id) primary-key race is a benign
+                # concurrent-first-insert to retry as an update on the winner's row.
+                # A barcode unique-index violation is a real conflict - surface it so
+                # the API maps it to 409 rather than swallowing it as a PK race.
+                if is_barcode_unique_violation(exc):
+                    raise BarcodeConflictError((fields.get("state") or {}).get("barcode")) from exc
+                constraint = getattr(getattr(exc, "orig", None), "constraint_name", None)
+                if constraint not in (None, "projections_pkey"):
+                    raise
                 projection = await ProjectionEngine._locked_projection(session, entry)
-        for column, value in ProjectionEngine._next_fields(projection.state, entry, projection.version).items():
+                if projection is None:
+                    raise
+        fields = ProjectionEngine._next_fields(projection.state, entry, projection.version)
+        for column, value in fields.items():
             setattr(projection, column, value)
+        # Flush inside a SAVEPOINT so a barcode unique-index violation on an UPDATE
+        # (not only a first insert) surfaces as BarcodeConflictError -> 409 instead
+        # of escaping to the outer commit masked as a 500. Unrelated integrity errors
+        # re-raise unchanged.
+        try:
+            async with session.begin_nested():
+                await session.flush()
+        except IntegrityError as exc:
+            if is_barcode_unique_violation(exc):
+                raise BarcodeConflictError((fields.get("state") or {}).get("barcode")) from exc
+            raise
 
     @staticmethod
     async def rebuild(session, company_id=None) -> None:

{celerp-2.3.0 → celerp-2.3.2}/celerp/services/field_schema.py

@@ -44,42 +44,74 @@ _DEFAULT_PRICE_LISTS: list[dict] = [
 
 # Base schema fields (without price columns - those are injected dynamically)
 _BASE_FIELDS: list[dict] = [
-    {"key": "sku",               "label": "SKU",               "type": "text",   "editable": True,  "required": True,  "options": [],                                            "visible_to_roles": [],               "position": 0,  "show_in_table": True},
-    {"key": "name",              "label": "Name",              "type": "text",   "editable": True,  "required": True,  "options": [],                                            "visible_to_roles": [],               "position": 1,  "show_in_table": True},
-    {"key": "category",          "label": "Category",          "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 2,  "show_in_table": True},
-    {"key": "quantity",          "label": "Qty",               "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3,   "show_in_table": True,  "tooltip_key": "field.tooltip.quantity"},
-    {"key": "sell_by",           "label": "Sell Unit",         "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.05,"show_in_table": False, "tooltip_key": "field.tooltip.sell_by"},
-    {"key": "weight",            "label": "Net Weight",        "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.02, "show_in_table": True,  "tooltip_key": "field.tooltip.weight"},
-    {"key": "weight_unit",       "label": "Net Weight Unit",   "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.15,"show_in_table": False, "tooltip_key": "field.tooltip.weight_unit"},
-    {"key": "pieces",            "label": "Pieces",            "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.06,"show_in_table": True,  "tooltip_key": "field.tooltip.pieces"},
-    {"key": "reorder_point",     "label": "Reorder Point",     "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.7, "show_in_table": False, "tooltip_key": "field.tooltip.reorder_point"},
-    {"key": "reorder_qty",       "label": "Reorder Qty",       "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.72,"show_in_table": False, "tooltip_key": "field.tooltip.reorder_qty"},
-    {"key": "gross_weight",      "label": "Gross Weight",      "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.25,"show_in_table": False, "tooltip_key": "field.tooltip.gross_weight"},
-    {"key": "gross_weight_unit", "label": "Gross Weight Unit", "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.3, "show_in_table": False, "tooltip_key": "field.tooltip.gross_weight_unit"},
-    {"key": "inventory_type",    "label": "Inventory Type",    "type": "select", "editable": True,  "required": False, "options": ["stocked", "component", "non_stocked", "service", "freight"], "visible_to_roles": [],               "position": 4.2, "show_in_table": False, "tooltip_key": "field.tooltip.inventory_type"},
-    {"key": "allow_splitting",   "label": "Allow Splitting",   "type": "bool",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 4.5, "show_in_table": False, "tooltip_key": "field.tooltip.allow_splitting"},
-    {"key": "pick_method",       "label": "Stock Cutting",     "type": "select", "editable": True,  "required": False, "options": ["default", "fifo", "fefo", "lifo"], "visible_to_roles": [],               "position": 4.6, "show_in_table": False, "tooltip_key": "field.tooltip.pick_method"},
-    {"key": "location_name",     "label": "Location",          "type": "text",   "editable": False, "required": False, "options": [],                                            "visible_to_roles": [],               "position": 5,  "show_in_table": True,  "tooltip_key": "field.tooltip.location_name"},
+    {"key": "sku",               "label": "SKU",               "type": "text",   "editable": True,  "required": True,  "options": [],                                            "visible_to_roles": [],               "position": 0,  "show_in_table": True, "label_key": "field.label.sku"},
+    {"key": "name",              "label": "Name",              "type": "text",   "editable": True,  "required": True,  "options": [],                                            "visible_to_roles": [],               "position": 1,  "show_in_table": True, "label_key": "field.label.name"},
+    {"key": "category",          "label": "Category",          "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 2,  "show_in_table": True, "label_key": "field.label.category"},
+    {"key": "quantity",          "label": "Qty",               "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3,   "show_in_table": True,  "tooltip_key": "field.tooltip.quantity", "label_key": "field.label.quantity"},
+    {"key": "sell_by",           "label": "Sell Unit",         "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.05,"show_in_table": False, "tooltip_key": "field.tooltip.sell_by", "label_key": "field.label.sell_by"},
+    {"key": "weight",            "label": "Net Weight",        "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.02, "show_in_table": True,  "tooltip_key": "field.tooltip.weight", "label_key": "field.label.weight"},
+    {"key": "weight_unit",       "label": "Net Weight Unit",   "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.15,"show_in_table": False, "tooltip_key": "field.tooltip.weight_unit", "label_key": "field.label.weight_unit"},
+    {"key": "pieces",            "label": "Pieces",            "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.06,"show_in_table": True,  "tooltip_key": "field.tooltip.pieces", "label_key": "field.label.pieces"},
+    {"key": "reorder_point",     "label": "Reorder Point",     "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.7, "show_in_table": False, "tooltip_key": "field.tooltip.reorder_point", "label_key": "field.label.reorder_point"},
+    {"key": "reorder_qty",       "label": "Reorder Qty",       "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.72,"show_in_table": False, "tooltip_key": "field.tooltip.reorder_qty", "label_key": "field.label.reorder_qty"},
+    {"key": "gross_weight",      "label": "Gross Weight",      "type": "number", "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.25,"show_in_table": False, "tooltip_key": "field.tooltip.gross_weight", "label_key": "field.label.gross_weight"},
+    {"key": "gross_weight_unit", "label": "Gross Weight Unit", "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 3.3, "show_in_table": False, "tooltip_key": "field.tooltip.gross_weight_unit", "label_key": "field.label.gross_weight_unit"},
+    {"key": "inventory_type",    "label": "Inventory Type",    "type": "select", "editable": True,  "required": False, "options": ["stocked", "component", "non_stocked", "service", "freight"], "visible_to_roles": [],               "position": 4.2, "show_in_table": False, "tooltip_key": "field.tooltip.inventory_type", "label_key": "field.label.inventory_type"},
+    {"key": "allow_splitting",   "label": "Allow Splitting",   "type": "bool",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 4.5, "show_in_table": False, "tooltip_key": "field.tooltip.allow_splitting", "label_key": "field.label.allow_splitting"},
+    {"key": "pick_method",       "label": "Stock Cutting",     "type": "select", "editable": True,  "required": False, "options": ["default", "fifo", "fefo", "lifo"], "visible_to_roles": [],               "position": 4.6, "show_in_table": False, "tooltip_key": "field.tooltip.pick_method", "label_key": "field.label.pick_method"},
+    {"key": "location_name",     "label": "Location",          "type": "text",   "editable": False, "required": False, "options": [],                                            "visible_to_roles": [],               "position": 5,  "show_in_table": True,  "tooltip_key": "field.tooltip.location_name", "label_key": "field.label.location_name"},
     # Price columns are injected dynamically at position 6+ by _inject_price_columns()
     # Read-only: status changes only through dedicated actions (Make Available, Revert
     # to Draft), never a free-form dropdown edit - same convention as document status.
-    {"key": "status",            "label": "Status",            "type": "status", "editable": False, "required": False, "options": [], "visible_to_roles": [],               "position": 100, "show_in_table": True},
-    {"key": "short_description", "label": "Short Description", "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 101, "show_in_table": False},
-    {"key": "description",       "label": "Description",       "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 102, "show_in_table": False},
-    {"key": "notes",             "label": "Notes",             "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 103, "show_in_table": False},
-    {"key": "barcode",           "label": "Barcode",           "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104, "show_in_table": True,  "tooltip_key": "field.tooltip.barcode"},
-    {"key": "hs_code",           "label": "HS Code",           "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.5, "show_in_table": False, "tooltip_key": "field.tooltip.hs_code"},
-    {"key": "country_of_origin", "label": "Country of Origin", "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.52,"show_in_table": False, "tooltip_key": "field.tooltip.country_of_origin"},
-    {"key": "preferred_supplier","label": "Preferred Supplier","type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.54,"show_in_table": False, "tooltip_key": "field.tooltip.preferred_supplier"},
-    {"key": "batch_no",          "label": "Batch / Lot No",    "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.55,"show_in_table": False, "tooltip_key": "field.tooltip.batch_no"},
-    {"key": "purchase_sku",              "label": "Purchase SKU",              "type": "text",   "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.6, "show_in_table": False, "tooltip_key": "field.tooltip.purchase_sku"},
-    {"key": "purchase_name",             "label": "Purchase Name",             "type": "text",   "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.7, "show_in_table": False, "tooltip_key": "field.tooltip.purchase_name"},
-    {"key": "purchase_unit",             "label": "Purchase Unit",             "type": "text",   "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.8, "show_in_table": True,  "tooltip_key": "field.tooltip.purchase_unit"},
-    {"key": "purchase_conversion_factor","label": "Conversion Factor",         "type": "number", "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.9, "show_in_table": False, "tooltip_key": "field.tooltip.purchase_conversion_factor"},
-    {"key": "created_at",        "label": "Created",           "type": "date",   "editable": False, "required": False, "options": [],                                            "visible_to_roles": [],               "position": 107, "show_in_table": False},
-    {"key": "updated_at",        "label": "Updated",           "type": "date",   "editable": False, "required": False, "options": [],                                            "visible_to_roles": [],               "position": 108, "show_in_table": False},
+    {"key": "status",            "label": "Status",            "type": "status", "editable": False, "required": False, "options": [], "visible_to_roles": [],               "position": 100, "show_in_table": True, "label_key": "field.label.status"},
+    {"key": "short_description", "label": "Short Description", "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 101, "show_in_table": False, "label_key": "field.label.short_description"},
+    {"key": "description",       "label": "Description",       "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 102, "show_in_table": False, "label_key": "field.label.description"},
+    {"key": "notes",             "label": "Notes",             "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 103, "show_in_table": False, "label_key": "field.label.notes"},
+    {"key": "barcode",           "label": "Barcode",           "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104, "show_in_table": True,  "tooltip_key": "field.tooltip.barcode", "label_key": "field.label.barcode"},
+    {"key": "hs_code",           "label": "HS Code",           "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.5, "show_in_table": False, "tooltip_key": "field.tooltip.hs_code", "label_key": "field.label.hs_code"},
+    {"key": "country_of_origin", "label": "Country of Origin", "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.52,"show_in_table": False, "tooltip_key": "field.tooltip.country_of_origin", "label_key": "field.label.country_of_origin"},
+    {"key": "preferred_supplier","label": "Preferred Supplier","type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.54,"show_in_table": False, "tooltip_key": "field.tooltip.preferred_supplier", "label_key": "field.label.preferred_supplier"},
+    {"key": "batch_no",          "label": "Batch / Lot No",    "type": "text",   "editable": True,  "required": False, "options": [],                                            "visible_to_roles": [],               "position": 104.55,"show_in_table": False, "tooltip_key": "field.tooltip.batch_no", "label_key": "field.label.batch_no"},
+    {"key": "purchase_sku",              "label": "Purchase SKU",              "type": "text",   "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.6, "show_in_table": False, "tooltip_key": "field.tooltip.purchase_sku", "label_key": "field.label.purchase_sku"},
+    {"key": "purchase_name",             "label": "Purchase Name",             "type": "text",   "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.7, "show_in_table": False, "tooltip_key": "field.tooltip.purchase_name", "label_key": "field.label.purchase_name"},
+    {"key": "purchase_unit",             "label": "Purchase Unit",             "type": "text",   "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.8, "show_in_table": True,  "tooltip_key": "field.tooltip.purchase_unit", "label_key": "field.label.purchase_unit"},
+    {"key": "purchase_conversion_factor","label": "Conversion Factor",         "type": "number", "editable": True,  "required": False, "options": [],  "visible_to_roles": [],  "position": 104.9, "show_in_table": False, "tooltip_key": "field.tooltip.purchase_conversion_factor", "label_key": "field.label.purchase_conversion_factor"},
+    {"key": "created_at",        "label": "Created",           "type": "date",   "editable": False, "required": False, "options": [],                                            "visible_to_roles": [],               "position": 107, "show_in_table": False, "label_key": "field.label.created_at"},
+    {"key": "updated_at",        "label": "Updated",           "type": "date",   "editable": False, "required": False, "options": [],                                            "visible_to_roles": [],               "position": 108, "show_in_table": False, "label_key": "field.label.updated_at"},
 ]
 
+# Built-in fields keyed for O(1) lookup when rehydrating stripped metadata.
+_BASE_FIELD_BY_KEY: dict[str, dict] = {f["key"]: f for f in _BASE_FIELDS}
+
+
+def _rehydrate_builtin_metadata(schema: list[dict]) -> list[dict]:
+    """Reattach canonical label_key/tooltip_key to built-in fields.
+
+    The item schema PATCH model does not carry label_key or tooltip_key, so a
+    company that customizes its schema stores built-in fields stripped of both.
+    Reattach them from _BASE_FIELDS, keyed strictly on built-in membership so
+    custom fields and dynamic price columns are never touched. label_key is
+    restored only when the stored label still equals the canonical English label
+    (a user-renamed built-in keeps its literal label and is never translated);
+    tooltip_key is restored for every built-in key, since there is no
+    custom-tooltip edit path. Idempotent: a field that already carries a key is
+    left as-is."""
+    out: list[dict] = []
+    for f in schema:
+        base = _BASE_FIELD_BY_KEY.get(f.get("key"))
+        if base is None:
+            out.append(f)
+            continue
+        updated = dict(f)
+        if ("label_key" not in updated and base.get("label_key")
+                and updated.get("label") == base.get("label")):
+            updated["label_key"] = base["label_key"]
+        if "tooltip_key" not in updated and base.get("tooltip_key"):
+            updated["tooltip_key"] = base["tooltip_key"]
+        out.append(updated)
+    return out
+
+
 def _inject_price_columns(base: list[dict], price_lists: list[dict]) -> list[dict]:
     """Insert a money column for each price list after position 5 (location).
 
@@ -190,5 +222,5 @@ async def get_effective_field_schema(
             keys_in_cat = {f["key"] for f in cat_fields}
             merged = [f for f in base_schema if f["key"] not in keys_in_cat]
             merged.extend(cat_fields)
-            return merged
-    return base_schema
+            return _rehydrate_builtin_metadata(merged)
+    return _rehydrate_builtin_metadata(base_schema)

{celerp-2.3.0 → celerp-2.3.2}/celerp/services/fulfill.py

@@ -10,6 +10,7 @@ and by the fulfillment module's toggle/pick screen.
 from __future__ import annotations
 
 import uuid as _uuid
+from collections.abc import Awaitable, Callable
 from datetime import datetime, timezone
 from typing import Any
 
@@ -42,16 +43,36 @@ async def execute_fulfill(
     company_id,
     user_id,
     doc_type: str = "",
+    allocate_barcodes: Callable[[int], Awaitable[list[str]]] | None = None,
 ) -> dict[str, Any]:
     """Execute fulfillment: emit item events, doc event, and COGS JE.
 
     Returns: {fulfillment_status, fulfilled_items, total_cogs}
+
+    A split pick carves a new child parcel off its parent lot; that child is a
+    fresh physical item and needs its own barcode. Core must not depend on the
+    inventory module, so the calling module injects allocation through
+    ``allocate_barcodes(count) -> list[str]`` (celerp_inventory allocates under
+    its code-namespace lock). When any split is planned and no allocator is
+    supplied, this fails before emitting a single event rather than minting a
+    barcodeless child.
     """
     now = datetime.now(timezone.utc).isoformat()
     fulfilled_items: list[dict] = []
     total_cogs = 0.0
     cid = _to_uuid(company_id)
     uid = _to_uuid(user_id)
+
+    # Allocate every split child's barcode up front, under the caller's lock, and
+    # fail clearly before any event is emitted if the allocator is missing.
+    split_picks = [p for p in pick_result.picks if p.action == "split"]
+    if split_picks and allocate_barcodes is None:
+        raise ValueError(
+            "Fulfillment must split a lot into a new child parcel that needs a "
+            "freshly allocated barcode, but no allocate_barcodes callback was "
+            "supplied. The calling module must inject inventory code allocation."
+        )
+    split_barcodes = iter(await allocate_barcodes(len(split_picks))) if split_picks else iter(())
     # Stable human doc number for the item's history (the entity_id suffix can diverge on
     # finalize/renumber, e.g. PF-... -> INV-...), so capture it from the doc at emit time.
     doc_number = doc_state.get("doc_number") or doc_state.get("ref_id") or ""
@@ -96,6 +117,7 @@ async def execute_fulfill(
                     "sku": pick.sku,   # child keeps the parent SKU (distinct lot by entity_id)
                     "name": pick.sku,
                     "quantity": pick.pick_qty,
+                    "barcode": next(split_barcodes),   # fresh per-lot barcode from the injected allocator
                 },
                 actor_id=uid,
                 location_id=None,

{celerp-2.3.0 → celerp-2.3.2}/celerp/tax_regimes.py

@@ -198,6 +198,22 @@ TAX_REGIMES: dict[str, _T] = {
              "description": "Tax-exempt", "is_compound": False, "default_order": 0},
         ],
     },
+    # ── Africa ────────────────────────────────────────────────────────────
+    "ET": {
+        "currency": "ETB",
+        "taxes": [
+            {"name": "VAT 15%", "rate": 15.0, "tax_type": "both", "is_default": True,
+             "description": "Ethiopia standard VAT", "is_compound": False, "default_order": 0},
+            {"name": "TOT 2%", "rate": 2.0, "tax_type": "sales", "is_default": False,
+             "description": "Turnover tax on goods (non-VAT-registered)", "is_compound": False, "default_order": 0},
+            {"name": "TOT 10%", "rate": 10.0, "tax_type": "sales", "is_default": False,
+             "description": "Turnover tax on services (non-VAT-registered)", "is_compound": False, "default_order": 0},
+            {"name": "Exempt", "rate": 0.0, "tax_type": "both", "is_default": False,
+             "description": "VAT-exempt", "is_compound": False, "default_order": 0},
+            {"name": "WHT 2%", "rate": -2.0, "tax_type": "purchase", "is_default": False,
+             "description": "Withholding tax on supply of goods", "is_compound": False, "default_order": 1},
+        ],
+    },
     # ── Fallback ──────────────────────────────────────────────────────────
     "_default": {
         "currency": "USD",

{celerp-2.3.0 → celerp-2.3.2}/celerp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: celerp
-Version: 2.3.0
+Version: 2.3.2
 Summary: Free, self-hosted ERP for small businesses
 License: Business Source License 1.1