lambda-erp 1.0.2__tar.gz → 1.1.1__tar.gz

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/PKG-INFO

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

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/api/chat.py

@@ -28,6 +28,7 @@ from openai import OpenAI
 
 from api.time_filters import TIME_FILTER_SCHEMA, time_filter_fields
 from api import services
+from api.chat_links import with_record_view_urls
 from api.tool_permissions import tool_allowed, tool_permission_error
 from api.demo_limits import (
     demo_call_reserve_usd,
@@ -1459,6 +1460,7 @@ def _validate_filter_columns(doctype_slug, filters) -> str | None:
     return None
 
 
+@with_record_view_urls("doctype")
 def _handle_list_documents(args):
     doctype = args["doctype"]
     try:
@@ -1497,10 +1499,12 @@ def _handle_get_document_fields(args):
     return services.document_field_metadata(args["doctype"])
 
 
+@with_record_view_urls("doctype")
 def _handle_get_document(args):
     return services.load_document(args["doctype"], args["name"])
 
 
+@with_record_view_urls("doctype")
 def _handle_create_document(args):
     data = args.get("data")
     if not data:
@@ -1508,10 +1512,12 @@ def _handle_create_document(args):
     return services.create_document(args["doctype"], data)
 
 
+@with_record_view_urls("doctype")
 def _handle_update_document(args):
     return services.update_document(args["doctype"], args["name"], args.get("data", {}))
 
 
+@with_record_view_urls("doctype")
 def _handle_batch_update_documents(args):
     try:
         return services.batch_update_documents(args["doctype"], args.get("updates"))
@@ -1519,18 +1525,22 @@ def _handle_batch_update_documents(args):
         return {"error": str(e)}
 
 
+@with_record_view_urls("doctype")
 def _handle_submit_document(args):
     return services.submit_document(args["doctype"], args["name"])
 
 
+@with_record_view_urls("doctype")
 def _handle_cancel_document(args):
     return services.cancel_document(args["doctype"], args["name"])
 
 
+@with_record_view_urls("doctype")
 def _handle_discard_document(args):
     return services.discard_document(args["doctype"], args["name"])
 
 
+@with_record_view_urls("target_doctype")
 def _handle_convert_document(args):
     return services.convert_document(args["doctype"], args["name"], args["target_doctype"])
 
@@ -1607,6 +1617,7 @@ def _handle_get_master_fields(args):
     }
 
 
+@with_record_view_urls("master_type", master=True)
 def _handle_search_masters(args):
     db = get_db()
     meta = bool(args.get("include_meta")) or args.get("time_filter") is not None
@@ -1724,6 +1735,7 @@ def _ignored_master_fields(master_type: str, data: dict) -> list[str]:
     return [k for k in data.keys() if k not in valid]
 
 
+@with_record_view_urls("master_type", master=True)
 def _handle_create_master(args):
     master_type = args["master_type"]
     data = args.get("data")
@@ -1750,6 +1762,7 @@ def _handle_create_master(args):
     return result
 
 
+@with_record_view_urls("master_type", master=True)
 def _handle_update_master(args):
     master_type = args["master_type"]
     name = args.get("name")
@@ -2464,18 +2477,11 @@ Examples:
 - Correct: `[SINV-0012](/app/sales-invoice/SINV-0012)`
 - Avoid:   `/reports/analytics?report_id=RPT-AB12CD34` (bare URL)"""
         document_links_section = """## Document & Master Links
-When referencing records, always use clickable markdown links so the user can open them directly.
-
-**Documents** (quotations, invoices, orders, deliveries, receipts, payments, journal entries, stock entries):
-- **View/edit link:** `/app/{doctype-slug}/{name}` — e.g. [SINV-0001](/app/sales-invoice/SINV-0001)
-- **PDF files:** call generate_document_pdf. Only link the returned download_url after successful generation; never construct PDF links yourself.
-The doctype slug is the lowercase, hyphenated form: sales-invoice, purchase-order, delivery-note, etc.
-
-**Master records** (customer, supplier, item, warehouse, company):
-- **View/edit link:** `/masters/{master-type}/{name}` — e.g. [SUPP-001](/masters/supplier/SUPP-001), [CUST-003](/masters/customer/CUST-003), [ITEM-001](/masters/item/ITEM-001)
-- NEVER use `/app/...` for masters — that path is only for transactional documents.
-
-Always include the view link after creating, submitting, converting, or updating a record. Call generate_document_pdf when a printable file is requested. Only confirm and link a successfully generated file."""
+Document and master tools return a canonical `view_url` on each record, including list/search rows and successful batch results. When linking a record, copy that exact value into a markdown link `[label](view_url)`. Never construct a record URL yourself, add a `#`, change the path, or re-encode the returned URL.
+`view_url` is tool output metadata, not a document/master field; never include it in create/update data.
+If `view_url` is null, refer to the record in plain text. For a projected document list or batch result missing parent-page information, call get_document to obtain its view_url if a link is needed. Some records have no page at all.
+Always include the returned view link, when available, after creating, submitting, converting, or updating a record.
+For PDF files, call generate_document_pdf and copy its returned download_url only after successful generation. Never construct PDF links yourself."""
 
     if user_role == "admin":
         role_desc = "You have **admin** access — full permissions to create, edit, submit, cancel documents, manage master data, run reports, and manage users."

lambda_erp-1.1.1/api/chat_links.py

@@ -0,0 +1,59 @@
+"""Canonical record links on chat/MCP tool results, never persisted fields."""
+
+from functools import wraps
+from urllib.parse import quote, urlencode
+
+from api import services
+
+
+def record_view_url(record_type: str, record: dict, *, master: bool = False) -> str | None:
+    name = record.get("name")
+    if not name:
+        return None
+    if master:
+        if record_type not in services.MASTER_TABLES or record_type == "cost-center":
+            return None
+        if record_type == "account":
+            return "/reports/general-ledger?" + urlencode({"account": name})
+        return f"/masters/{quote(record_type, safe='')}/{quote(str(name), safe='')}"
+
+    slug = services.DOCTYPE_TO_SLUG.get(record_type, record_type)
+    if slug not in services.SLUG_TO_DOCTYPE:
+        return None
+    page = services.chat_doctype_page_info(slug)
+    if page:
+        if page["kind"] == "none":
+            return None
+        if page["kind"] == "via":
+            name = record.get(page["link_field"])
+            if not name:
+                # Projected list/batch results may omit the parent. The model
+                # can get_document to obtain it; do not guess a destination.
+                return None
+            slug = page["parent_slug"]
+    return f"/app/{quote(slug, safe='')}/{quote(str(name), safe='')}"
+
+
+def with_record_view_urls(type_arg: str, *, master: bool = False):
+    """Enrich records and list/batch envelopes without changing service data."""
+    def decorate(handler):
+        @wraps(handler)
+        def wrapped(args):
+            result = handler(args)
+
+            def enrich(row):
+                if not isinstance(row, dict) or "error" in row or row.get("ok") is False:
+                    return row
+                return {**row, "view_url": record_view_url(args.get(type_arg), row, master=master)}
+
+            if isinstance(result, list):
+                return [enrich(row) for row in result]
+            if isinstance(result, dict) and "error" not in result:
+                if "name" not in result:
+                    for key in ("rows", "results"):
+                        if isinstance(result.get(key), list):
+                            return {**result, key: [enrich(row) for row in result[key]]}
+                return enrich(result)
+            return result
+        return wrapped
+    return decorate

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/api/pdf_profiles.py

@@ -88,6 +88,12 @@ PROFILES.update({
         tables=(PDFTable('monthly_distribution', ('month', 'percentage'), ('month', 'percentage')),)),
     'Pricing Rule': PDFProfile('record', 'Pricing rule overview',
         fields=('title', 'company', 'item_code', 'selling', 'buying', 'rate_or_discount', 'rate', 'discount_percentage', 'discount_amount', 'min_qty', 'valid_from', 'valid_upto', 'priority', 'enabled'), required=('title', 'rate_or_discount')),
+    'Price List': PDFProfile('record', 'Price list overview',
+        fields=('price_list_name', 'currency', 'selling', 'buying', 'enabled'),
+        required=('price_list_name', 'currency')),
+    'Item Price': PDFProfile('record', 'Item price overview',
+        fields=('item_code', 'price_list', 'customer', 'supplier', 'uom', 'min_qty', 'rate', 'valid_from', 'valid_upto', 'enabled'),
+        required=('item_code', 'price_list', 'rate')),
     'Bank Account': PDFProfile('record', 'Bank account overview',
         fields=('account_name', 'company', 'account', 'iban', 'currency', 'bank_name', 'bic', 'disabled'), required=('account_name', 'company', 'account', 'iban', 'currency')),
     'Bank Transaction': PDFProfile('record', 'Bank transaction overview',

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/api/routers/masters.py

@@ -67,6 +67,8 @@ DELETE_REFERENCE_CHECKS = {
         ('SELECT 1 FROM "POS Invoice" WHERE customer = ? LIMIT 1', "POS invoice"),
         ('SELECT 1 FROM "Payment Entry" WHERE party_type = \'Customer\' AND party = ? LIMIT 1', "payment entry"),
         ('SELECT 1 FROM "Subscription" WHERE party_type = \'Customer\' AND party = ? LIMIT 1', "subscription"),
+        ('SELECT 1 FROM "Item Price" WHERE customer = ? LIMIT 1', "item price"),
+        ('SELECT 1 FROM "Pricing Rule" WHERE customer = ? LIMIT 1', "pricing rule"),
     ],
     "supplier": [
         ('SELECT 1 FROM "Purchase Order" WHERE supplier = ? LIMIT 1', "purchase order"),
@@ -88,6 +90,7 @@ DELETE_REFERENCE_CHECKS = {
         ('SELECT 1 FROM "Stock Ledger Entry" WHERE item_code = ? LIMIT 1', "stock ledger entry"),
         ('SELECT 1 FROM "Bin" WHERE item_code = ? LIMIT 1', "bin"),
         ('SELECT 1 FROM "Pricing Rule" WHERE item_code = ? LIMIT 1', "pricing rule"),
+        ('SELECT 1 FROM "Item Price" WHERE item_code = ? LIMIT 1', "item price"),
         ('SELECT 1 FROM "Subscription Plan" WHERE item_code = ? LIMIT 1', "subscription plan"),
         ('SELECT 1 FROM "Asset" WHERE item_code = ? LIMIT 1', "asset"),
         ('SELECT 1 FROM "Reservation" WHERE item_code = ? LIMIT 1', "reservation"),
@@ -213,6 +216,8 @@ def _normalize_master_data(data: dict) -> dict:
 
 
 MASTER_LINK_FIELDS = {
+    'customer': {'default_price_list': 'Price List'},
+    'company': {'default_price_list': 'Price List'},
     'item': {'default_warehouse': 'Warehouse'},
     'warehouse': {'company': 'Company', 'account': 'Account', 'parent_warehouse': 'Warehouse'},
     'account': {'company': 'Company', 'parent_account': 'Account'},

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/api/services.py

@@ -23,6 +23,7 @@ from lambda_erp.stock.delivery_note import DeliveryNote, make_delivery_note, mak
 from lambda_erp.stock.purchase_receipt import PurchaseReceipt, make_purchase_receipt, make_purchase_receipt_return
 from lambda_erp.accounting.pos_invoice import POSInvoice
 from lambda_erp.controllers.pricing_rule import PricingRule
+from lambda_erp.controllers.item_price import PriceList, ItemPrice
 from lambda_erp.accounting.budget import Budget
 from lambda_erp.accounting.subscription import Subscription
 from lambda_erp.accounting.bank_transaction import BankTransaction
@@ -47,6 +48,8 @@ DOCUMENT_CLASSES = {
     "Purchase Receipt": PurchaseReceipt,
     "POS Invoice": POSInvoice,
     "Pricing Rule": PricingRule,
+    "Price List": PriceList,
+    "Item Price": ItemPrice,
     "Budget": Budget,
     "Subscription": Subscription,
     "Bank Transaction": BankTransaction,

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/lambda_erp/accounting/pos_invoice.py

@@ -13,7 +13,11 @@ from lambda_erp.model import Document
 from lambda_erp.utils import _dict, flt, nowdate
 from lambda_erp.database import get_db
 from lambda_erp.controllers.taxes_and_totals import calculate_taxes_and_totals
-from lambda_erp.controllers.defaults import set_default_currency
+from lambda_erp.controllers.defaults import (
+    set_default_currency, apply_external_source_defaults,
+    derived_pricing_fields, derived_line_pricing_fields,
+)
+from lambda_erp.controllers.item_price import set_item_defaults
 from lambda_erp.exceptions import ValidationError
 from lambda_erp.stock.stock_ledger import (
     make_sl_entries,
@@ -65,16 +69,44 @@ class POSInvoice(Document):
         if not self.posting_date:
             self.posting_date = nowdate()
 
+        apply_external_source_defaults(self)
         self._set_customer_name()
         self._set_missing_accounts()
+        set_default_currency(self, "Customer", "customer")
         self._set_item_defaults()
+        self._validate_external_source_stock()
         if self.is_return:
             self._validate_return()
-        set_default_currency(self, "Customer", "customer")
+        # POS was the only selling document that never applied pricing rules.
+        # Nothing about a till sale makes a discount inapplicable, so the same
+        # item rang up at a different price depending on which document the
+        # sale happened to be written to.
+        from lambda_erp.controllers.pricing_rule import apply_pricing_rules
+        apply_pricing_rules(self)
+
         calculate_taxes_and_totals(self)
         self._calculate_payments()
         self._set_status()
 
+    def _validate_external_source_stock(self):
+        """An upstream system's stock movement already accounts for the goods.
+
+        `_validate_no_double_shipment` catches the same mistake on the Sales
+        Order -> Delivery Note path by looking up `sales_order_item`. A document
+        created from an external system has no such link, so that lookup finds
+        nothing and passes. Without this guard the upstream issue and this
+        document's own update_stock each decrement the same quantity.
+        """
+        if not self._data.get("external_source"):
+            return
+        if flt(self.get("update_stock")):
+            raise ValidationError(
+                f"Cannot submit with update_stock=1: this document is sourced "
+                f"from {self._data['external_source']}, which already recorded "
+                f"the stock movement. Use this invoice as a bill only and "
+                f"record any required stock movement in a separate stock document."
+            )
+
     def _validate_return(self):
         from lambda_erp.workflow import validate_return
         validate_return(self)
@@ -100,18 +132,8 @@ class POSInvoice(Document):
                     item["cost_center"] = default_cc
 
     def _set_item_defaults(self):
-        db = get_db()
-        for item in self.get("items"):
-            if item.get("item_code") and not item.get("item_name"):
-                item_data = db.get_value(
-                    "Item", item["item_code"],
-                    ["item_name", "description", "stock_uom", "standard_rate"]
-                )
-                if item_data:
-                    item["item_name"] = item_data.item_name
-                    item["uom"] = item.get("uom") or item_data.stock_uom
-                    if item.get("rate") is None and item.get("price_list_rate") is None:
-                        item["rate"] = flt(item_data.standard_rate)
+        """Names, units and unsupplied rates. See controllers/item_price.py."""
+        set_item_defaults(self, "Customer", "customer", set_description=False)
 
     def _calculate_payments(self):
         paid = sum(flt(p.get("amount", 0)) for p in self.get("payments") or [])
@@ -197,16 +219,17 @@ class POSInvoice(Document):
             account = item.get("income_account")
             if not account:
                 continue
-            income_accounts[account] = income_accounts.get(account, 0) + flt(item.get("net_amount", 0))
+            key = (account, item.get("cost_center"))
+            income_accounts[key] = income_accounts.get(key, 0) + flt(item.get("net_amount", 0))
 
-        for account, amount in income_accounts.items():
+        for (account, cost_center), amount in income_accounts.items():
             gl_entries.append(_dict(
                 account=account,
                 credit=flt(amount, 2),
                 credit_in_account_currency=flt(amount, 2),
                 debit=0,
                 debit_in_account_currency=0,
-                cost_center=db.get_value("Company", self.company, "default_cost_center"),
+                cost_center=cost_center,
                 voucher_type=self.DOCTYPE,
                 voucher_no=self.name,
                 posting_date=self.posting_date,
@@ -288,6 +311,7 @@ def make_pos_return(posi_name):
         raise ValidationError("Cannot create a return against a return")
 
     return_pos = POSInvoice(
+        **derived_pricing_fields(original, is_return=True),
         customer=original.customer,
         company=original.company,
         currency=original.get("currency") or "USD",
@@ -302,6 +326,7 @@ def make_pos_return(posi_name):
     from lambda_erp.workflow import returnable_rows
     for item in returnable_rows(original):
         return_pos.append("items", _dict(
+            **derived_line_pricing_fields(item),
             item_code=item.get("item_code"),
             item_name=item.get("item_name"),
             description=item.get("description"),

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/lambda_erp/accounting/purchase_invoice.py

@@ -14,7 +14,11 @@ from lambda_erp.model import Document
 from lambda_erp.utils import _dict, flt, nowdate, add_days
 from lambda_erp.database import get_db
 from lambda_erp.controllers.taxes_and_totals import calculate_taxes_and_totals
-from lambda_erp.controllers.defaults import set_default_currency
+from lambda_erp.controllers.defaults import (
+    set_default_currency, apply_external_source_defaults,
+    derived_pricing_fields, derived_line_pricing_fields,
+)
+from lambda_erp.controllers.item_price import set_item_defaults
 from lambda_erp.accounting.general_ledger import make_gl_entries, make_reverse_gl_entries, to_base_currency
 from lambda_erp.stock.stock_ledger import (
     make_sl_entries,
@@ -65,11 +69,14 @@ class PurchaseInvoice(Document):
         if not self.posting_date:
             self.posting_date = nowdate()
 
+        apply_external_source_defaults(self)
         self._set_supplier_name()
         self._set_missing_accounts()
+        set_default_currency(self, "Supplier", "supplier")
         self._set_item_defaults()
         self._validate_stock_warehouses()
         self._validate_no_double_receipt()
+        self._validate_external_source_stock()
 
         if self.is_return:
             self._validate_return()
@@ -77,7 +84,6 @@ class PurchaseInvoice(Document):
         from lambda_erp.controllers.pricing_rule import apply_pricing_rules
         apply_pricing_rules(self)
 
-        set_default_currency(self, "Supplier", "supplier")
 
         calculate_taxes_and_totals(self)
 
@@ -172,6 +178,25 @@ class PurchaseInvoice(Document):
                 f"is already allocated against it. Cancel the Payment Entry first."
             )
 
+    def _validate_external_source_stock(self):
+        """An upstream system's stock movement already accounts for the goods.
+
+        `_validate_no_double_shipment` catches the same mistake on the Sales
+        Order -> Delivery Note path by looking up `sales_order_item`. A document
+        created from an external system has no such link, so that lookup finds
+        nothing and passes. Without this guard the upstream issue and this
+        document's own update_stock each decrement the same quantity.
+        """
+        if not self._data.get("external_source"):
+            return
+        if flt(self.get("update_stock")):
+            raise ValidationError(
+                f"Cannot submit with update_stock=1: this document is sourced "
+                f"from {self._data['external_source']}, which already recorded "
+                f"the stock movement. Use this invoice as a bill only and "
+                f"record any required stock movement in a separate stock document."
+            )
+
     def _validate_no_double_receipt(self):
         """Block update_stock=1 when the referenced Purchase Order already has
         a Purchase Receipt for the line. Otherwise stock arrives twice: once
@@ -202,19 +227,8 @@ class PurchaseInvoice(Document):
                 )
 
     def _set_item_defaults(self):
-        db = get_db()
-        for item in self.get("items"):
-            if item.get("item_code") and not item.get("item_name"):
-                item_data = db.get_value(
-                    "Item", item["item_code"],
-                    ["item_name", "description", "stock_uom", "standard_rate"]
-                )
-                if item_data:
-                    item["item_name"] = item_data.item_name
-                    item["description"] = item.get("description") or item_data.description
-                    item["uom"] = item.get("uom") or item_data.stock_uom
-                    if item.get("rate") is None and item.get("price_list_rate") is None:
-                        item["rate"] = flt(item_data.standard_rate)
+        """Names, units and unsupplied rates. See controllers/item_price.py."""
+        set_item_defaults(self, "Supplier", "supplier")
 
     def _validate_return(self):
         from lambda_erp.workflow import validate_return
@@ -408,6 +422,7 @@ def make_purchase_return(pinv_name):
         raise ValidationError("Cannot create a return against a return")
 
     return_inv = PurchaseInvoice(
+        **derived_pricing_fields(original, is_return=True),
         supplier=original.supplier,
         company=original.company,
         currency=original.get("currency") or "USD",
@@ -425,6 +440,7 @@ def make_purchase_return(pinv_name):
     from lambda_erp.workflow import returnable_rows
     for item in returnable_rows(original):
         return_inv.append("items", _dict(
+            **derived_line_pricing_fields(item),
             item_code=item.get("item_code"),
             item_name=item.get("item_name"),
             description=item.get("description"),

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/lambda_erp/accounting/sales_invoice.py

@@ -18,7 +18,11 @@ from lambda_erp.model import Document
 from lambda_erp.utils import _dict, flt, getdate, nowdate, add_days
 from lambda_erp.database import get_db
 from lambda_erp.controllers.taxes_and_totals import calculate_taxes_and_totals
-from lambda_erp.controllers.defaults import set_default_currency
+from lambda_erp.controllers.defaults import (
+    set_default_currency, apply_external_source_defaults,
+    derived_pricing_fields, derived_line_pricing_fields,
+)
+from lambda_erp.controllers.item_price import set_item_defaults
 from lambda_erp.accounting.general_ledger import make_gl_entries, make_reverse_gl_entries, to_base_currency
 from lambda_erp.stock.stock_ledger import (
     make_sl_entries,
@@ -81,10 +85,13 @@ class SalesInvoice(Document):
         if not self.posting_date:
             self.posting_date = nowdate()
 
+        apply_external_source_defaults(self)
         self._set_customer_name()
         self._set_missing_accounts()
+        set_default_currency(self, "Customer", "customer")
         self._set_item_defaults()
         self._validate_no_double_shipment()
+        self._validate_external_source_stock()
 
         if self.is_return:
             self._validate_return()
@@ -92,7 +99,6 @@ class SalesInvoice(Document):
         from lambda_erp.controllers.pricing_rule import apply_pricing_rules
         apply_pricing_rules(self)
 
-        set_default_currency(self, "Customer", "customer")
 
         calculate_taxes_and_totals(self)
 
@@ -133,19 +139,27 @@ class SalesInvoice(Document):
                     item["cost_center"] = default_cc
 
     def _set_item_defaults(self):
-        db = get_db()
-        for item in self.get("items"):
-            if item.get("item_code") and not item.get("item_name"):
-                item_data = db.get_value(
-                    "Item", item["item_code"],
-                    ["item_name", "description", "stock_uom", "standard_rate"]
-                )
-                if item_data:
-                    item["item_name"] = item_data.item_name
-                    item["description"] = item.get("description") or item_data.description
-                    item["uom"] = item.get("uom") or item_data.stock_uom
-                    if item.get("rate") is None and item.get("price_list_rate") is None:
-                        item["rate"] = flt(item_data.standard_rate)
+        """Names, units and unsupplied rates. See controllers/item_price.py."""
+        set_item_defaults(self, "Customer", "customer")
+
+    def _validate_external_source_stock(self):
+        """An upstream system's stock movement already accounts for the goods.
+
+        `_validate_no_double_shipment` catches the same mistake on the Sales
+        Order -> Delivery Note path by looking up `sales_order_item`. A document
+        created from an external system has no such link, so that lookup finds
+        nothing and passes. Without this guard the upstream issue and this
+        document's own update_stock each decrement the same quantity.
+        """
+        if not self._data.get("external_source"):
+            return
+        if flt(self.get("update_stock")):
+            raise ValidationError(
+                f"Cannot submit with update_stock=1: this document is sourced "
+                f"from {self._data['external_source']}, which already recorded "
+                f"the stock movement. Use this invoice as a bill only and "
+                f"record any required stock movement in a separate stock document."
+            )
 
     def _validate_no_double_shipment(self):
         """Block update_stock=1 when the referenced Sales Order already has a
@@ -338,15 +352,14 @@ class SalesInvoice(Document):
         )
 
         # 2. Credit: Income accounts (per item)
-        #    In the reference implementation, items with the same income_account are grouped
+        # Group only lines with the same account AND cost centre.
         income_accounts = {}
         for item in self.get("items"):
             account = item.get("income_account")
-            if account not in income_accounts:
-                income_accounts[account] = 0
-            income_accounts[account] += flt(item.get("net_amount", 0))
+            key = (account, item.get("cost_center"))
+            income_accounts[key] = income_accounts.get(key, 0) + flt(item.get("net_amount", 0))
 
-        for account, amount in income_accounts.items():
+        for (account, cost_center), amount in income_accounts.items():
             gl_entries.append(
                 _dict(
                     account=account,
@@ -354,7 +367,7 @@ class SalesInvoice(Document):
                     credit_in_account_currency=flt(amount, 2),
                     debit=0,
                     debit_in_account_currency=0,
-                    cost_center=self.get("items")[0].get("cost_center") if self.get("items") else None,
+                    cost_center=cost_center,
                     voucher_type=self.DOCTYPE,
                     voucher_no=self.name,
                     posting_date=self.posting_date,
@@ -373,7 +386,7 @@ class SalesInvoice(Document):
                         credit_in_account_currency=flt(tax["tax_amount"], 2),
                         debit=0,
                         debit_in_account_currency=0,
-                        cost_center=self.get("items")[0].get("cost_center") if self.get("items") else None,
+                        cost_center=get_db().get_value("Company", self.company, "default_cost_center"),
                         voucher_type=self.DOCTYPE,
                         voucher_no=self.name,
                         posting_date=self.posting_date,
@@ -404,6 +417,7 @@ def make_sales_return(sinv_name):
         raise ValidationError("Cannot create a return against a return")
 
     return_inv = SalesInvoice(
+        **derived_pricing_fields(original, is_return=True),
         customer=original.customer,
         company=original.company,
         currency=original.get("currency") or "USD",
@@ -421,6 +435,7 @@ def make_sales_return(sinv_name):
     from lambda_erp.workflow import returnable_rows
     for item in returnable_rows(original):
         return_inv.append("items", _dict(
+            **derived_line_pricing_fields(item),
             item_code=item.get("item_code"),
             item_name=item.get("item_name"),
             description=item.get("description"),

{lambda_erp-1.0.2 → lambda_erp-1.1.1}/lambda_erp/buying/purchase_order.py

@@ -14,7 +14,11 @@ from lambda_erp.model import Document
 from lambda_erp.utils import _dict, flt, getdate, nowdate
 from lambda_erp.database import get_db
 from lambda_erp.controllers.taxes_and_totals import calculate_taxes_and_totals
-from lambda_erp.controllers.defaults import set_default_currency
+from lambda_erp.controllers.defaults import (
+    set_default_currency, apply_external_source_defaults,
+    derived_pricing_fields, derived_line_pricing_fields,
+)
+from lambda_erp.controllers.item_price import set_item_defaults
 from lambda_erp.exceptions import ValidationError
 
 class PurchaseOrder(Document):
@@ -49,13 +53,14 @@ class PurchaseOrder(Document):
         if not self.transaction_date:
             self.transaction_date = nowdate()
 
+        apply_external_source_defaults(self)
         self._set_supplier_name()
+        set_default_currency(self, "Supplier", "supplier")
         self._set_item_defaults()
 
         from lambda_erp.controllers.pricing_rule import apply_pricing_rules
         apply_pricing_rules(self)
 
-        set_default_currency(self, "Supplier", "supplier")
 
         calculate_taxes_and_totals(self)
 
@@ -65,19 +70,8 @@ class PurchaseOrder(Document):
             self.supplier_name = db.get_value("Supplier", self.supplier, "supplier_name")
 
     def _set_item_defaults(self):
-        db = get_db()
-        for item in self.get("items"):
-            if item.get("item_code") and not item.get("item_name"):
-                item_data = db.get_value(
-                    "Item", item["item_code"],
-                    ["item_name", "description", "stock_uom", "standard_rate"]
-                )
-                if item_data:
-                    item["item_name"] = item_data.item_name
-                    item["description"] = item.get("description") or item_data.description
-                    item["uom"] = item.get("uom") or item_data.stock_uom
-                    if item.get("rate") is None and item.get("price_list_rate") is None:
-                        item["rate"] = flt(item_data.standard_rate)
+        """Names, units and unsupplied rates. See controllers/item_price.py."""
+        set_item_defaults(self, "Supplier", "supplier")
 
     def _update_ordered_qty(self, direction=1):
         from lambda_erp.workflow import refresh_order_progress
@@ -101,6 +95,7 @@ def make_purchase_invoice(purchase_order_name):
         raise ValidationError("Purchase Order must be submitted before creating Purchase Invoice")
 
     pi = PurchaseInvoice(
+        **derived_pricing_fields(po, is_return=False),
         supplier=po.supplier,
         supplier_name=po.supplier_name,
         company=po.company,
@@ -116,6 +111,7 @@ def make_purchase_invoice(purchase_order_name):
             continue
 
         pi.append("items", _dict(
+            **derived_line_pricing_fields(item),
             item_code=item.get("item_code"),
             item_name=item.get("item_name"),
             description=item.get("description"),