mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-14 04:15:10 +00:00
feat: add cost center field to the stock entry accounting dimension tab
(cherry picked from commit 47772f4e77)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.json
This commit is contained in:
@@ -514,7 +514,9 @@ frappe.ui.form.on("Stock Entry", {
|
|||||||
frm.fields_dict.items.grid.refresh();
|
frm.fields_dict.items.grid.refresh();
|
||||||
frm.cscript.toggle_related_fields(frm.doc);
|
frm.cscript.toggle_related_fields(frm.doc);
|
||||||
},
|
},
|
||||||
|
cost_center(frm, cdt, cdn) {
|
||||||
|
erpnext.utils.copy_value_in_all_rows(frm.doc, cdt, cdn, "items", "cost_center");
|
||||||
|
},
|
||||||
validate_purpose_consumption: function (frm) {
|
validate_purpose_consumption: function (frm) {
|
||||||
frappe
|
frappe
|
||||||
.call({
|
.call({
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
"address_display",
|
"address_display",
|
||||||
"accounting_dimensions_section",
|
"accounting_dimensions_section",
|
||||||
"project",
|
"project",
|
||||||
|
"column_break_wgvc",
|
||||||
|
"cost_center",
|
||||||
"other_info_tab",
|
"other_info_tab",
|
||||||
"printing_settings",
|
"printing_settings",
|
||||||
"select_print_heading",
|
"select_print_heading",
|
||||||
@@ -699,6 +701,52 @@
|
|||||||
"fieldtype": "Data",
|
"fieldtype": "Data",
|
||||||
"is_virtual": 1,
|
"is_virtual": 1,
|
||||||
"label": "Last Scanned Warehouse"
|
"label": "Last Scanned Warehouse"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"default": "0",
|
||||||
|
"fieldname": "is_additional_transfer_entry",
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"hidden": 1,
|
||||||
|
"label": "Is Additional Transfer Entry",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"depends_on": "subcontracting_inward_order",
|
||||||
|
"fieldname": "subcontracting_inward_order",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Subcontracting Inward Order",
|
||||||
|
"options": "Subcontracting Inward Order",
|
||||||
|
"read_only": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "reference_section",
|
||||||
|
"fieldtype": "Section Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_jabv",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "reference_details_section",
|
||||||
|
"fieldtype": "Section Break",
|
||||||
|
"label": "Reference"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_qpvo",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_wgvc",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "cost_center",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Cost Center",
|
||||||
|
"options": "Cost Center"
|
||||||
|
>>>>>>> 47772f4e77 (feat: add cost center field to the stock entry accounting dimension tab)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"icon": "fa fa-file-text",
|
"icon": "fa fa-file-text",
|
||||||
@@ -706,7 +754,11 @@
|
|||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2025-08-04 19:21:03.338958",
|
"modified": "2025-08-04 19:21:03.338958",
|
||||||
|
=======
|
||||||
|
"modified": "2026-03-04 19:03:23.426082",
|
||||||
|
>>>>>>> 47772f4e77 (feat: add cost center field to the stock entry accounting dimension tab)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Stock Entry",
|
"name": "Stock Entry",
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ class StockEntry(StockController):
|
|||||||
asset_repair: DF.Link | None
|
asset_repair: DF.Link | None
|
||||||
bom_no: DF.Link | None
|
bom_no: DF.Link | None
|
||||||
company: DF.Link
|
company: DF.Link
|
||||||
|
cost_center: DF.Link | None
|
||||||
credit_note: DF.Link | None
|
credit_note: DF.Link | None
|
||||||
delivery_note_no: DF.Link | None
|
delivery_note_no: DF.Link | None
|
||||||
fg_completed_qty: DF.Float
|
fg_completed_qty: DF.Float
|
||||||
|
|||||||
Reference in New Issue
Block a user