nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50793 from ljain112/fix-asset-repair-accounting-dimensions

Browse Source 
fix: include accounting dimensions in stock entries created during asset repair.
This commit is contained in:
Khushi Rawat
2025-12-02 11:56:35 +05:30
committed by GitHub
parent b4fbda4da3 cdbe8b909b
commit e9e498cbd0
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/assets/doctype/asset_repair/asset_repair.js
View File

@@ -73,14 +73,7 @@ frappe.ui.form.on("Asset Repair", {
}, },
refresh: function (frm) { refresh: function (frm) {
if (frm.doc.docstatus) { frm.events.show_general_ledger(frm);
frm.add_custom_button(__("View General Ledger"), function () {
frappe.route_options = {
voucher_no: frm.doc.name,
};
frappe.set_route("query-report", "General Ledger");
});
}
let sbb_field = frm.get_docfield("stock_items", "serial_and_batch_bundle"); let sbb_field = frm.get_docfield("stock_items", "serial_and_batch_bundle");
if (sbb_field) { if (sbb_field) {
@@ -144,6 +137,26 @@ frappe.ui.form.on("Asset Repair", {
frm.set_value("repair_cost", 0); frm.set_value("repair_cost", 0);
} }
}, },
show_general_ledger: (frm) => {
if (frm.doc.docstatus > 0) {
frm.add_custom_button(
__("Accounting Ledger"),
function () {
frappe.route_options = {
voucher_no: frm.doc.name,
from_date: frm.doc.posting_date,
to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
company: frm.doc.company,
categorize_by: "",
show_cancelled_entries: frm.doc.docstatus === 2,
};
frappe.set_route("query-report", "General Ledger");
},
__("View")
);
}
},
}); });
frappe.ui.form.on("Asset Repair Consumed Item", { frappe.ui.form.on("Asset Repair Consumed Item", {

12
erpnext/assets/doctype/asset_repair/asset_repair.py
View File

@@ -7,6 +7,9 @@ from frappe.query_builder import DocType
from frappe.utils import cint, flt, get_link_to_form, getdate, time_diff_in_hours from frappe.utils import cint, flt, get_link_to_form, getdate, time_diff_in_hours
import erpnext import erpnext
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
get_accounting_dimensions,
)
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries
from erpnext.assets.doctype.asset.asset import get_asset_account from erpnext.assets.doctype.asset.asset import get_asset_account
from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity from erpnext.assets.doctype.asset_activity.asset_activity import add_asset_activity
@@ -231,6 +234,12 @@ class AssetRepair(AccountsController):
} }
) )
accounting_dimensions = {
"cost_center": self.cost_center,
"project": self.project,
**{dimension: self.get(dimension) for dimension in get_accounting_dimensions()},
}
for stock_item in self.get("stock_items"): for stock_item in self.get("stock_items"):
self.validate_serial_no(stock_item) self.validate_serial_no(stock_item)
@@ -242,8 +251,7 @@ class AssetRepair(AccountsController):
"qty": stock_item.consumed_quantity, "qty": stock_item.consumed_quantity,
"basic_rate": stock_item.valuation_rate, "basic_rate": stock_item.valuation_rate,
"serial_and_batch_bundle": stock_item.serial_and_batch_bundle, "serial_and_batch_bundle": stock_item.serial_and_batch_bundle,
"cost_center": self.cost_center, **accounting_dimensions,
"project": self.project,
}, },
) )