diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 5e81cc3184a..600002fcfe4 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -691,6 +691,10 @@ class SalesInvoice(SellingController): def clear_unallocated_mode_of_payments(self): POSService(self).clear_unallocated_mode_of_payments() + # Called by POS Invoice + def validate_full_payment(self): + POSService(self).validate_full_payment() + def get_company_abbr(self): return frappe.db.get_value("Company", self.company, "abbr") diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index 51ec360f8bf..fe406d6ad3a 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -105,7 +105,7 @@ class TestPurchaseOrder(ERPNextTestSuite): Regression test for #55246: the mapper dropped rows once received_qty >= qty, ignoring the configured tolerance. """ - from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt + from erpnext.buying.doctype.purchase_order.mapper import make_purchase_receipt # 50% tolerance — 10 ordered allows up to 15 received frappe.db.set_value("Item", "_Test Item", "over_delivery_receipt_allowance", 50) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 4c08150605c..5f54cab0d2f 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -1055,7 +1055,7 @@ class TestPurchaseReceipt(ERPNextTestSuite): """ Party-derived fields on DN (from Customer) must not leak into the mapped PR. """ - from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt + from erpnext.stock.doctype.delivery_note.mapper import make_inter_company_purchase_receipt from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note prepare_data_for_internal_transfer() @@ -1339,7 +1339,8 @@ class TestPurchaseReceipt(ERPNextTestSuite): - Create PI from PO and submit - Create PR from PO and submit """ - from erpnext.buying.doctype.purchase_order import purchase_order, test_purchase_order + from erpnext.buying.doctype.purchase_order import mapper as purchase_order + from erpnext.buying.doctype.purchase_order import test_purchase_order po = test_purchase_order.create_purchase_order() @@ -1360,7 +1361,8 @@ class TestPurchaseReceipt(ERPNextTestSuite): - Create partial PI from PO and submit - Create PR from PO and submit """ - from erpnext.buying.doctype.purchase_order import purchase_order, test_purchase_order + from erpnext.buying.doctype.purchase_order import mapper as purchase_order + from erpnext.buying.doctype.purchase_order import test_purchase_order po = test_purchase_order.create_purchase_order() diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index c0e6b8f2382..f8a5d6bda32 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -2890,10 +2890,10 @@ class TestStockEntryCoverage(ERPNextTestSuite): @ERPNextTestSuite.change_settings("Global Defaults", {"default_company": "_Test Company"}) def test_validate_fg_resets_invalid_serial_no_on_manufacture(self): from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom - from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record - from erpnext.manufacturing.doctype.work_order.work_order import ( + from erpnext.manufacturing.doctype.work_order.mapper import ( make_stock_entry as _make_stock_entry, ) + from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record fg_item = "_FG Serial No Item" rm_item = "RM for serial item" @@ -2930,10 +2930,10 @@ class TestStockEntryCoverage(ERPNextTestSuite): @ERPNextTestSuite.change_settings("Global Defaults", {"default_company": "_Test Company"}) def test_validate_fg_resets_invalid_batch_no_on_manufacture(self): from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom - from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record - from erpnext.manufacturing.doctype.work_order.work_order import ( + from erpnext.manufacturing.doctype.work_order.mapper import ( make_stock_entry as _make_stock_entry, ) + from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record from erpnext.stock.serial_batch_bundle import get_batches_from_bundle fg_item = "_FG Batch No Item" diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html index 5563a58b730..853c2566969 100644 --- a/erpnext/templates/pages/order.html +++ b/erpnext/templates/pages/order.html @@ -23,7 +23,7 @@