nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 02:40:02 +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

2
erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.js
View File

@@ -99,7 +99,7 @@ frappe.ui.form.on("Subcontracting Inward Order", {
if (frm.doc.sales_order) {
erpnext.utils.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_subcontracting_inward_order",
method: "erpnext.selling.doctype.sales_order.mapper.make_subcontracting_inward_order",
source_name: frm.doc.sales_order,
target_doc: frm,
freeze: true,

6
erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py
View File

@@ -3,8 +3,8 @@
import frappe
from erpnext.manufacturing.doctype.work_order.work_order import make_stock_entry as make_stock_entry_from_wo
from erpnext.selling.doctype.sales_order.sales_order import make_subcontracting_inward_order
from erpnext.manufacturing.doctype.work_order.mapper import make_stock_entry as make_stock_entry_from_wo
from erpnext.selling.doctype.sales_order.mapper import make_subcontracting_inward_order
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -368,7 +368,7 @@ class IntegrationTestSubcontractingInwardOrder(ERPNextTestSuite):
frappe.new_doc("Stock Entry").update(scio.make_subcontracting_delivery()).submit()
scio.reload()
from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
from erpnext.selling.doctype.sales_order.mapper import make_sales_invoice
si = make_sales_invoice(so.name)
self.assertEqual(si.items[-1].item_code, "Self RM")

2
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
View File

@@ -145,7 +145,7 @@ frappe.ui.form.on("Subcontracting Order", {
if (frm.doc.purchase_order) {
erpnext.utils.map_current_doc({
method: "erpnext.buying.doctype.purchase_order.purchase_order.make_subcontracting_order",
method: "erpnext.buying.doctype.purchase_order.mapper.make_subcontracting_order",
source_name: frm.doc.purchase_order,
target_doc: frm,
freeze: true,

4
erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
View File

@@ -7,7 +7,7 @@ from collections import defaultdict
import frappe
from frappe.utils import flt
from erpnext.buying.doctype.purchase_order.purchase_order import get_mapped_subcontracting_order
from erpnext.buying.doctype.purchase_order.mapper import get_mapped_subcontracting_order
from erpnext.controllers.subcontracting_controller import (
get_materials_from_supplier,
make_rm_stock_entry,
@@ -624,7 +624,7 @@ class TestSubcontractingOrder(ERPNextTestSuite):
self.assertEqual(ordered_qty + 10, new_ordered_qty)
def test_requested_qty_for_subcontracting_order(self):
from erpnext.stock.doctype.material_request.material_request import make_purchase_order
from erpnext.stock.doctype.material_request.mapper import make_purchase_order
from erpnext.stock.doctype.material_request.test_material_request import make_material_request
requested_qty = frappe.db.get_value(

6
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
View File

@@ -68,7 +68,7 @@ frappe.ui.form.on("Subcontracting Receipt", {
__("Purchase Receipt"),
() => {
frappe.model.open_mapped_doc({
method: "erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receipt.make_purchase_receipt",
method: "erpnext.subcontracting.doctype.subcontracting_receipt.mapper.make_purchase_receipt",
frm: frm,
freeze: true,
freeze_message: __("Creating Purchase Receipt ..."),
@@ -85,7 +85,7 @@ frappe.ui.form.on("Subcontracting Receipt", {
() => {
const make_standard_return = () => {
frappe.model.open_mapped_doc({
method: "erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receipt.make_subcontract_return",
method: "erpnext.subcontracting.doctype.subcontracting_receipt.mapper.make_subcontract_return",
frm: frm,
});
};
@@ -109,7 +109,7 @@ frappe.ui.form.on("Subcontracting Receipt", {
function (values) {
if (values.return_for_rejected_warehouse) {
frappe.call({
method: "erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receipt.make_subcontract_return_against_rejected_warehouse",
method: "erpnext.subcontracting.doctype.subcontracting_receipt.mapper.make_subcontract_return_against_rejected_warehouse",
args: {
source_name: frm.doc.name,
},

2
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
View File

@@ -21,8 +21,6 @@ from erpnext.stock.stock_ledger import get_valuation_rate
from .mapper import (
make_purchase_receipt,
make_subcontract_return,
make_subcontract_return_against_rejected_warehouse,
)

2
erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
View File

@@ -1315,7 +1315,7 @@ class TestSubcontractingReceipt(ERPNextTestSuite):
def test_subcontract_return_from_rejected_warehouse(self):
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
from erpnext.subcontracting.doctype.subcontracting_receipt.subcontracting_receipt import (
from erpnext.subcontracting.doctype.subcontracting_receipt.mapper import (
make_subcontract_return_against_rejected_warehouse,
)