nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-02 16:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use mapper paths directly, drop re-export shims

Browse Source 
Repoint all JS method strings and Python imports for mapper functions
across 18 doctypes from the doctype module to its mapper module, and
remove the now-unused re-export shims from each doctype file (keeping
only names used internally).
This commit is contained in:
Nabin Hait
2026-06-01 18:17:56 +05:30
parent 498cd2b371
commit 530e587bf2
113 changed files with 394 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/assets/doctype/asset/asset.js
View File

@@ -333,7 +333,7 @@ frappe.ui.form.on("Asset", {
make_journal_entry: function (frm) {
frappe.call({
method: "erpnext.assets.doctype.asset.asset.make_journal_entry",
method: "erpnext.assets.doctype.asset.mapper.make_journal_entry",
args: {
asset_name: frm.doc.name,
},
@@ -570,7 +570,7 @@ frappe.ui.form.on("Asset", {
asset_category: frm.doc.asset_category,
company: frm.doc.company,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_maintenance",
method: "erpnext.assets.doctype.asset.mapper.create_asset_maintenance",
callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
@@ -585,7 +585,7 @@ frappe.ui.form.on("Asset", {
asset: frm.doc.name,
asset_name: frm.doc.asset_name,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_repair",
method: "erpnext.assets.doctype.asset.mapper.create_asset_repair",
callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
@@ -601,7 +601,7 @@ frappe.ui.form.on("Asset", {
asset_name: frm.doc.asset_name,
item_code: frm.doc.item_code,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_capitalization",
method: "erpnext.assets.doctype.asset.mapper.create_asset_capitalization",
callback: function (r) {
var doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
@@ -612,7 +612,7 @@ frappe.ui.form.on("Asset", {
sell_asset: function (frm) {
const make_sales_invoice = (sell_qty) => {
frappe.call({
method: "erpnext.assets.doctype.asset.asset.make_sales_invoice",
method: "erpnext.assets.doctype.asset.mapper.make_sales_invoice",
args: {
asset: frm.doc.name,
item_code: frm.doc.item_code,
@@ -696,7 +696,7 @@ frappe.ui.form.on("Asset", {
asset_name: frm.doc.name,
split_qty: cint(dialog_data.split_qty),
},
method: "erpnext.assets.doctype.asset.asset.split_asset",
method: "erpnext.assets.doctype.asset.mapper.split_asset",
callback: function (r) {
let doclist = frappe.model.sync(r.message);
frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
@@ -716,7 +716,7 @@ frappe.ui.form.on("Asset", {
asset_category: frm.doc.asset_category,
company: frm.doc.company,
},
method: "erpnext.assets.doctype.asset.asset.create_asset_value_adjustment",
method: "erpnext.assets.doctype.asset.mapper.create_asset_value_adjustment",
freeze: 1,
callback: function (r) {
var doclist = frappe.model.sync(r.message);

10
erpnext/assets/doctype/asset/asset.py
View File

@@ -37,16 +37,6 @@ from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_sched
)
from erpnext.controllers.accounts_controller import AccountsController
from .mapper import (
create_asset_capitalization,
create_asset_maintenance,
create_asset_repair,
create_asset_value_adjustment,
make_journal_entry,
make_sales_invoice,
split_asset,
)
class Asset(AccountsController):
# begin: auto-generated types

8
erpnext/assets/doctype/asset/test_asset.py
View File

@@ -18,8 +18,6 @@ from frappe.utils.data import add_to_date
from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
from erpnext.assets.doctype.asset.asset import (
make_sales_invoice,
split_asset,
update_maintenance_status,
)
from erpnext.assets.doctype.asset.depreciation import (
@@ -27,11 +25,15 @@ from erpnext.assets.doctype.asset.depreciation import (
restore_asset,
scrap_asset,
)
from erpnext.assets.doctype.asset.mapper import (
make_sales_invoice,
split_asset,
)
from erpnext.assets.doctype.asset_depreciation_schedule.asset_depreciation_schedule import (
get_asset_depr_schedule_doc,
get_depr_schedule,
)
from erpnext.stock.doctype.purchase_receipt.purchase_receipt import (
from erpnext.stock.doctype.purchase_receipt.mapper import (
make_purchase_invoice as make_invoice,
)
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt

2
erpnext/assets/doctype/asset_repair/test_asset_repair.py
View File

@@ -9,6 +9,8 @@ from frappe.utils import add_days, add_months, flt, get_first_day, nowdate, nowt
from erpnext.assets.doctype.asset.asset import (
get_asset_account,
get_asset_value_after_depreciation,
)
from erpnext.assets.doctype.asset.mapper import (
make_sales_invoice,
)
from erpnext.assets.doctype.asset.test_asset import (