lambda-erp 1.1.8__tar.gz → 1.1.10__tar.gz

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lambda-erp
-Version: 1.1.8
+Version: 1.1.10
 Summary: Core ERP logic - accounting, sales, purchasing, inventory
 Author: TORUS INVESTMENTS AG
 License-Expression: Apache-2.0

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/api/chat.py

@@ -473,6 +473,11 @@ DOCUMENT_SLUGS = [
 
 MASTER_TYPES = ["customer", "supplier", "item", "warehouse", "account", "company", "cost-center"]
 
+# Discovery for direct (MCP) clients, which don't get the chat system prompt.
+# The native chat already carries WORKFLOW_GUIDANCE in its prompt; offering the
+# tool there made the model re-fetch ~4k tokens of the same context most turns.
+DIRECT_CLIENT_ONLY_TOOLS = frozenset({"get_erp_context"})
+
 TOOLS = [
     {"type": "function", "function": {
         "name": "get_erp_context",
@@ -1400,7 +1405,7 @@ def _chat_doctype_section() -> str:
     )
 
 
-def build_tools(user_info: dict | None = None):
+def build_tools(user_info: dict | None = None, *, native_chat: bool = False):
     """TOOLS widened with live plugin types and registered business actions.
 
     Plugins register doctypes and masters at startup — after this module is
@@ -1410,19 +1415,20 @@ def build_tools(user_info: dict | None = None):
     per request (cheap next to the LLM call), which also makes plugin load
     order irrelevant. Only enums that exactly match the core lists are
     widened, so any differently-constrained doctype/master param (e.g. a
-    curated subset) is left alone.
+    curated subset) is left alone. `native_chat` drops the direct-client-only
+    discovery tools the chat prompt already covers.
     """
     extra_docs = _extra_document_slugs()
     extra_masters = _extra_master_types()
     action_tools = services.registered_action_tools()
-    hidden_tools: set[str] = set()
+    hidden_tools: set[str] = set(DIRECT_CLIENT_ONLY_TOOLS) if native_chat else set()
     if user_info is not None:
         role = user_info.get("role")
         action_tools = [
             tool for tool in action_tools
             if tool_allowed(tool["function"]["name"], role)
         ]
-        hidden_tools = {
+        hidden_tools |= {
             tool["function"]["name"] for tool in TOOLS
             if not tool_allowed(tool["function"]["name"], role)
         }
@@ -3645,7 +3651,7 @@ async def run_thinking_loop(
                 # or the legacy API for compatible models. Returns Chat-shaped
                 # (message, usage) either way, so everything below is unchanged.
                 message, usage = await asyncio.to_thread(
-                    _orchestrator_turn, openai_client, messages, build_tools(user_info), max_completion,
+                    _orchestrator_turn, openai_client, messages, build_tools(user_info, native_chat=True), max_completion,
                 )
             except Exception as e:
                 await on_event({"type": "error", "content": f"Error calling LLM: {e}"})
@@ -3817,7 +3823,7 @@ async def run_thinking_loop(
                         "stands alone: do NOT refer to 'the results above' or to earlier messages."
                     ),
                 }],
-                build_tools(user_info),
+                build_tools(user_info, native_chat=True),
                 2048,
                 tool_choice="none",
             )

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/api/pdf.py

@@ -7,7 +7,7 @@ from jinja2 import Environment, FileSystemLoader, ChoiceLoader
 from weasyprint import HTML
 from lambda_erp.database import get_db
 from api.services import load_document, get_document_class
-from api.pdf_contract import prepare, validate_rendered_pdf, PDFError
+from api.pdf_contract import prepare, validate_rendered_pdf, PDFError, register_pdf_state_labels  # noqa: F401
 from api.remarks_md import render_remarks
 from lambda_erp.controllers.taxes_and_totals import split_by_frequency
 
@@ -193,17 +193,17 @@ def _render_commercial_pdf(doctype_slug, name, doc, contract):
     if doc.get("status"):
         meta_fields.append({"label": "Status", "value": doc["status"]})
 
-    # Items — refresh each line's item_name from the Item master so a later
-    # correction to an item's name appears on the PDF, consistent with the
-    # party/company names. Quantities, rates, and amounts stay as transacted.
-    # Falls back to the name stored on the line if the master is gone.
+    # Items — print the name written on each line. A line may carry its own
+    # wording under a generic article (e.g. one project service with a
+    # "Phase 1: …" line per step), so the Item master's name is only a
+    # fallback for a line that has none.
     items = doc.get("items", [])
     for item in items:
         code = item.get("item_code")
-        if code:
-            live_item_name = db.get_value("Item", code, "item_name")
-            if live_item_name:
-                item["item_name"] = live_item_name
+        if code and not item.get("item_name"):
+            master_item_name = db.get_value("Item", code, "item_name")
+            if master_item_name:
+                item["item_name"] = master_item_name
 
     taxes = doc.get("taxes", [])
 
@@ -229,6 +229,7 @@ def _render_commercial_pdf(doctype_slug, name, doc, contract):
     context = dict(
         doc=doc,
         pdf_status=contract["status"],
+        pdf_state_notice=contract["notice"],
         pdf_warnings=contract["warnings"],
         title=title,
         company_name=company_name,
@@ -334,16 +335,16 @@ def _render_proposal_pdf(name, proposal, contract):
         if quote.get('company') != proposal.get('company') or quote.get('customer') != proposal.get('customer'):
             raise PDFError('Proposal PDF: quotation company and customer must match')
         quote_contract = prepare('Quotation', quote)
-        # Each included offer must be rendered completely. Its state is printed
-        # alongside its number, including historical cancelled/voided offers.
+        # Each included offer must be rendered completely. A non-final state
+        # (draft, cancelled, discarded) is printed beside its number.
         contract['tokens'].extend(quote_contract['tokens'])
         contract['warnings'].extend(quote_contract['warnings'])
         items = quote.get("items", []) or []
-        # Refresh each line's item_name from the master, consistent with the
-        # single-document path.
+        # The line's own name wins; the master's only fills an empty one,
+        # consistent with the single-document path.
         for item in items:
             code = item.get("item_code")
-            if code:
+            if code and not item.get("item_name"):
                 live = db.get_value("Item", code, "item_name")
                 if live:
                     item["item_name"] = live
@@ -352,6 +353,7 @@ def _render_proposal_pdf(name, proposal, contract):
             "letter": chr(ord("A") + i),
             "quotation": qname,
             "pdf_status": quote_contract["status"],
+            "pdf_state_notice": quote_contract["notice"],
             "title": row.get("position_title") or default_title or qname,
             "blurb": row.get("position_blurb") or quote.get("remarks") or "",
             "is_recommended": bool(row.get("is_recommended")),
@@ -373,6 +375,7 @@ def _render_proposal_pdf(name, proposal, contract):
     context = dict(
         proposal=proposal,
         pdf_status=contract["status"],
+        pdf_state_notice=contract["notice"],
         pdf_warnings=contract["warnings"],
         title=proposal.get("title") or "Offerte",
         company_name=company_name,
@@ -416,6 +419,7 @@ def _render_record_pdf(doctype, name, doc, contract):
     page_size_row = get_db().sql('SELECT value FROM "Settings" WHERE key = ?', ['pdf_page_size'])
     context = dict(
         title=contract['profile'].title, name=name, pdf_status=contract['status'],
+        pdf_state_notice=contract['notice'],
         pdf_warnings=contract['warnings'], print_fields=contract['fields'],
         print_tables=contract['tables'], print_labels={}, print_title=contract['profile'].title,
         company_info=company, company_name=company.get('company_name') or doc.get('company') or '',

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/api/pdf_contract.py

@@ -61,6 +61,31 @@ def resolve(table, name):
     return (db.get_value(table, name, display) if display in fields else None) or name
 
 
+# States a reader must not mistake for a final, issued document. Only these are
+# printed as a notice and required in the rendered text; a submitted invoice or
+# an ordinary record status carries no notice.
+NOTICE_STATES = ('Draft', 'Cancelled', 'Discarded')
+_state_labels = {}
+
+
+def register_pdf_state_labels(labels) -> None:
+    """Override the printed notice for non-final states, e.g. {'Draft': 'Entwurf'}.
+
+    Keys must be in NOTICE_STATES. The label is what templates print as
+    `pdf_state_notice` and what the rendered-text check then requires.
+    """
+    unknown = set(labels) - set(NOTICE_STATES)
+    if unknown:
+        raise ValueError(f'Unknown PDF notice states: {sorted(unknown)}')
+    if any(not str(label).strip() for label in labels.values()):
+        raise ValueError('PDF notice labels must not be empty')
+    _state_labels.update(labels)
+
+
+def notice_for(state):
+    return _state_labels.get(state, state) if state in NOTICE_STATES else ''
+
+
 def state_for(doctype, doc):
     from api.services import DOCUMENT_CLASSES
     if doc.get('discarded'):
@@ -87,9 +112,10 @@ def prepare(doctype, doc):
         if not any(not missing(doc.get(key)) for key in group):
             raise PDFError('PDF requires at least one of: ' + ', '.join(group), fields=group)
     state = state_for(doctype, doc)
-    tokens = [str(doc['name']), state]
+    notice = notice_for(state)
+    tokens = [str(doc['name'])] + ([notice] if notice else [])
     warnings = []
-    if state in {'Draft', 'Cancelled', 'Discarded'}:
+    if notice:
         warnings.append({'code': 'pdf_document_state', 'message': f'{doctype} {doc["name"]}: {state}'})
     company = {}
     if doc.get('company'):
@@ -213,7 +239,7 @@ def prepare(doctype, doc):
     if doctype == 'Subscription':
         party_currency = get_db().get_value(party_type, party_id, 'default_currency') if party_id else None
         fields.append({'key': 'currency', 'value': party_currency or company_currency})
-    return {'profile': profile, 'status': state, 'warnings': warnings, 'tokens': tokens,
+    return {'profile': profile, 'status': state, 'notice': notice, 'warnings': warnings, 'tokens': tokens,
             'fields': fields, 'tables': tables, 'party_name': party_name,
             'company': company, 'company_currency': company_currency}
 
@@ -228,8 +254,9 @@ def _item(row, tokens, index):
     if not any(not missing(row.get(k)) for k in ('item_code', 'item_name', 'description')):
         raise PDFError(f'PDF requires item identity: items[{index}]')
     if row.get('item_code'):
-        live = resolve('Item', row['item_code'])
-        row['item_name'] = live  # only the isolated output snapshot is changed
+        master_name = resolve('Item', row['item_code'])  # the article must still exist
+        if missing(row.get('item_name')):
+            row['item_name'] = master_name  # only the isolated output snapshot is changed
     tokens.append(str(row.get('item_name') or row.get('item_code') or row['description']))
 
 

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/api/templates/_record_base.html

@@ -16,7 +16,7 @@ tr { break-inside: avoid; } .brand { font-weight: bold; letter-spacing: .8pt; }
 {% macro label(key) %}{{ print_labels.get(key, key.replace('_',' ').capitalize()) }}{% endmacro %}
 {% block letterhead %}<div class="header"><div class="brand">{{ company_name }}</div>{% if company_info.get('address') %}<div class="muted">{{ company_info.get('address') }}</div>{% endif %}</div>{% endblock %}
 <h1>{{ print_title }}</h1>
-<div class="state">{{ name }} · {{ pdf_status }}</div>
+<div class="state">{{ name }} · {{ pdf_state_notice or pdf_status }}</div>
 {% for warning in pdf_warnings %}<div class="warning">{{ warning.message }}</div>{% endfor %}
 {% if party_name %}<p><strong>{{ party_name }}</strong></p>{% endif %}
 {% if company_currency %}<div class="muted">{{ label('company_currency') }}: {{ company_currency }}</div>{% endif %}

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/api/templates/document.html

@@ -58,10 +58,11 @@
   .remarks .rm-hr { border-top: 1px solid #d1d5db; margin: 6px 0; }
   .remarks em { font-style: italic; }
   .remarks strong { font-weight: 700; }
+  .state-notice { display: inline-block; margin-bottom: 8pt; padding: 3px 10px; border: 1.5px solid #b91c1c; border-radius: 4px; color: #b91c1c; font-size: 10pt; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; }
 </style>
 </head>
 <body>
-<div style="font-size:9pt; margin-bottom:8pt">{{ pdf_status }}</div>
+{% if pdf_state_notice %}<div class="state-notice">{{ pdf_state_notice }}</div>{% endif %}
 
 {# ---- Header ---- #}
 <div class="header">

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/api/templates/proposal.html

@@ -34,10 +34,11 @@
   table.lines td.desc { color: #333; }
 
   .footer { margin-top: 28px; padding-top: 10px; border-top: 1px solid #e5e7eb; font-size: 7.5pt; color: #999; text-align: center; }
+  .state-notice { display: inline-block; margin-bottom: 8pt; padding: 3px 10px; border: 1.5px solid #b91c1c; border-radius: 4px; color: #b91c1c; font-size: 10pt; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; }
 </style>
 </head>
 <body>
-<div style="font-size:9pt; margin-bottom:8pt">{{ pdf_status }}</div>
+{% if pdf_state_notice %}<div class="state-notice">{{ pdf_state_notice }}</div>{% endif %}
 
 <div class="header">
   <div><div class="company">{{ company_name or proposal.company or "" }}</div></div>
@@ -69,7 +70,7 @@
 {% if proposal.cover_letter %}<div class="cover">{{ proposal.cover_letter }}</div>{% endif %}
 
 {% for p in positions %}
-<div style="font-size:8pt">{{ p.quotation }} · {{ p.pdf_status }}</div>
+{% if p.pdf_state_notice %}<div style="font-size:8pt">{{ p.quotation }} · <span class="state-notice" style="font-size:8pt; padding:1px 6px; margin:0">{{ p.pdf_state_notice }}</span></div>{% endif %}
 <div class="position">
   <div class="pos-head">
     <span class="letter">{{ p.letter }}</span>

{lambda_erp-1.1.8 → lambda_erp-1.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lambda-erp"
-version = "1.1.8"
+version = "1.1.10"
 description = "Core ERP logic - accounting, sales, purchasing, inventory"
 readme = "README.md"
 license = "Apache-2.0"