From b32e4daf2b2a38e31b7e9213eb05d71217c94269 Mon Sep 17 00:00:00 2001 From: Sugesh393 Date: Thu, 6 Feb 2025 13:31:10 +0530 Subject: [PATCH] fix: add accounting dimensions section in sales order item (cherry picked from commit 7d47869f4b0b6a5b0b05cda14a1290daa9cdc60f) # Conflicts: # erpnext/selling/doctype/sales_order_item/sales_order_item.json --- .../sales_order_item/sales_order_item.json | 40 ++++++++++++++++++- .../sales_order_item/sales_order_item.py | 2 + 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index fb9e895ccb7..2df6dc3ea83 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -106,7 +106,11 @@ "purchase_order", "column_break_89", "material_request_item", - "purchase_order_item" + "purchase_order_item", + "accounting_dimensions_section", + "cost_center", + "column_break_ihdh", + "project" ], "fields": [ { @@ -926,12 +930,46 @@ "fieldname": "available_quantity_section", "fieldtype": "Section Break", "label": "Available Quantity" + }, + { + "collapsible": 1, + "fieldname": "accounting_dimensions_section", + "fieldtype": "Section Break", + "label": "Accounting Dimensions" + }, + { + "allow_on_submit": 1, + "default": ":Company", + "fieldname": "cost_center", + "fieldtype": "Link", + "label": "Cost Center", + "options": "Cost Center", + "print_hide": 1, + "print_width": "120px", + "reqd": 1, + "width": "120px" + }, + { + "fieldname": "column_break_ihdh", + "fieldtype": "Column Break" + }, + { + "allow_on_submit": 1, + "fieldname": "project", + "fieldtype": "Link", + "label": "Project", + "options": "Project", + "search_index": 1 } ], "idx": 1, "istable": 1, "links": [], +<<<<<<< HEAD "modified": "2024-11-21 14:21:29.743474", +======= + "modified": "2025-02-06 13:29:24.619850", +>>>>>>> 7d47869f4b (fix: add accounting dimensions section in sales order item) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.py b/erpnext/selling/doctype/sales_order_item/sales_order_item.py index 888ea755e2e..7f2a37b1616 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.py +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.py @@ -32,6 +32,7 @@ class SalesOrderItem(Document): brand: DF.Link | None company_total_stock: DF.Float conversion_factor: DF.Float + cost_center: DF.Link customer_item_code: DF.Data | None delivered_by_supplier: DF.Check delivered_qty: DF.Float @@ -68,6 +69,7 @@ class SalesOrderItem(Document): pricing_rules: DF.SmallText | None produced_qty: DF.Float production_plan_qty: DF.Float + project: DF.Link | None projected_qty: DF.Float purchase_order: DF.Link | None purchase_order_item: DF.Data | None