mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-27 05:45:19 +00:00
918e5a28db
* fix(stock): carry accounting dimensions from Landed Cost Voucher charges into GL entries * feat(stock): add accounting dimension fields to Landed Cost Taxes and Charges The charge row had no dimension fields, so a dimension marked mandatory for Profit and Loss accounts could not be supplied anywhere on the voucher. Add the accounting dimensions section, cost center and project, and register the doctype in accounting_dimension_doctypes so custom dimension fields are created on it. The section and column break are required for that hook to place the generated fields correctly. Cost center deliberately omits the ":Company" default used by Purchase Taxes and Charges: this child table is also the additional costs table on Stock Entry and Subcontracting Receipt, and auto-filling it there would change existing postings. * refactor(stock): group landed cost charges by expense account and dimensions get_item_account_wise_lcv_entries keyed its inner map by expense account alone, so two charge rows posting to the same account - whether in one voucher or across vouchers - were merged. Amounts accumulated correctly but any per-row context was lost to whichever row was seen first. Key the grouping by (expense account, dimension values) and return a list of charges per receipt item, each carrying its own dimensions, so rows that differ only by dimension stay distinct. Dimensions resolve from the charge row first, then the voucher item row. Blanks are left blank so the GL composers can fall back to the receipt item and receipt document as before. * refactor(accounts): allow explicit accounting dimensions on add_gl_entry get_gl_dict derives dimensions from the parent document and the item row, and reads only custom dimensions off the item - never cost center or project. Callers that need to set a dimension from some other source had no way to do so except by building the args dict by hand. Add a dimensions argument that is merged into the entry before get_gl_dict is called, and thread it through the StockController and BaseGLComposer wrappers. * fix(stock): carry landed cost charge dimensions onto the GL entries Landed cost charges are posted into the receipt document's ledger, and their expense account is a Profit and Loss account. Until now the entry took its dimensions from the receipt item, which cannot know about a voucher created after it was submitted, so a dimension mandatory for P&L accounts failed. Take cost center, project and custom dimensions from the charge row, falling back to the receipt item and receipt document when the row leaves them blank. Only the leg posting to the charge account is affected; the reclass leg keeps the item's dimensions so it still nets against the base item entry. Also skip charges that prorate to zero, and hoist the landed cost lookup in the Purchase Receipt composer out of the item loop - it was reloading every voucher once per item. * fix(stock): report missing mandatory dimensions on the Landed Cost Voucher row Submitting a voucher re-makes the receipt document's GL entries, so a missing mandatory dimension surfaced as a GL Entry error naming an account, raised from the middle of update_landed_cost, with nothing pointing at the row that caused it. Check the charge rows during validate instead, against both the mandatory for P&L / Balance Sheet flags and the per-account Accounting Dimension Filter, and name the row, the dimension and the account in the message. The check resolves values through the same fallback chain the GL composers use, so it does not reject a voucher that would have posted successfully. * test(stock): cover accounting dimensions on landed cost vouchers Covers the charge row reaching the GL entry, cost center and project overriding the receipt item, the blank row still falling back to it, and two charge rows - and two vouchers - on the same expense account with different dimensions staying separate entries. Also covers the mandatory P&L dimension being satisfied from the charge row, the missing one being reported on the voucher, dimensions surviving a repost, and each dimension netting to zero on cancellation. * refactor(lcv): apply custom dimension overrides via .update() --------- Co-authored-by: nareshkannasln <nareshkannashanmugam@gmail.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>