test: Add test case for Subcontracting Receipt GL Entries
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index bc503f5..8490d14 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -897,7 +897,7 @@
"item_name": row.item_code,
"rate": row.rate or 100,
"stock_uom": row.stock_uom or "Nos",
- "warehouse": row.warehuose or "_Test Warehouse - _TC",
+ "warehouse": row.warehouse or "_Test Warehouse - _TC",
}
item_details = args.itemwise_details.get(row.item_code)
@@ -1031,9 +1031,9 @@
if not args.service_items:
service_items = [
{
- "warehouse": "_Test Warehouse - _TC",
+ "warehouse": args.warehouse or "_Test Warehouse - _TC",
"item_code": "Subcontracted Service Item 7",
- "qty": 5,
+ "qty": 10,
"rate": 100,
"fg_item": "Subcontracted Item SA7",
"fg_item_qty": 10,
@@ -1046,6 +1046,7 @@
rm_items=service_items,
is_subcontracted=1,
supplier_warehouse=args.supplier_warehouse or "_Test Warehouse 1 - _TC",
+ company=args.company,
)
return create_subcontracting_order(po_name=po.name, **args)
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
index 94bb38e..a676e48 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
@@ -511,7 +511,7 @@
for item in sco.items:
item.include_exploded_items = args.get("include_exploded_items", 1)
- if args.get("warehouse"):
+ if args.warehouse:
for item in sco.items:
item.warehouse = args.warehouse
else:
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 763e768..b5e6139 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -6,8 +6,10 @@
import frappe
from frappe.tests.utils import FrappeTestCase
-from frappe.utils import flt
+from frappe.utils import cint, flt
+import erpnext
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.controllers.sales_and_purchase_return import make_return_doc
from erpnext.controllers.tests.test_subcontracting_controller import (
get_rm_items,
@@ -22,6 +24,7 @@
set_backflush_based_on,
)
from erpnext.stock.doctype.item.test_item import make_item
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import (
make_subcontracting_receipt,
@@ -317,6 +320,103 @@
args = frappe._dict(scr_name=scr1.name, qty=-15)
self.assertRaises(OverAllowanceError, make_return_subcontracting_receipt, **args)
+ def test_subcontracting_receipt_no_gl_entry(self):
+ sco = get_subcontracting_order()
+ rm_items = get_rm_items(sco.supplied_items)
+ itemwise_details = make_stock_in_entry(rm_items=rm_items)
+ make_stock_transfer_entry(
+ sco_no=sco.name,
+ rm_items=rm_items,
+ itemwise_details=copy.deepcopy(itemwise_details),
+ )
+
+ scr = make_subcontracting_receipt(sco.name)
+ scr.append(
+ "additional_costs",
+ {
+ "expense_account": "Expenses Included In Valuation - _TC",
+ "description": "Test Additional Costs",
+ "amount": 100,
+ },
+ )
+ scr.save()
+ scr.submit()
+
+ stock_value_difference = frappe.db.get_value(
+ "Stock Ledger Entry",
+ {
+ "voucher_type": "Subcontracting Receipt",
+ "voucher_no": scr.name,
+ "item_code": "Subcontracted Item SA7",
+ "warehouse": "_Test Warehouse - _TC",
+ },
+ "stock_value_difference",
+ )
+
+ # Service Cost(100 * 10) + Raw Materials Cost(50 * 10) + Additional Costs(100) = 1600
+ self.assertEqual(stock_value_difference, 1600)
+ self.assertFalse(get_gl_entries("Subcontracting Receipt", scr.name))
+
+ def test_subcontracting_receipt_gl_entry(self):
+ sco = get_subcontracting_order(
+ company="_Test Company with perpetual inventory",
+ warehouse="Stores - TCP1",
+ supplier_warehouse="Work In Progress - TCP1",
+ )
+ rm_items = get_rm_items(sco.supplied_items)
+ itemwise_details = make_stock_in_entry(rm_items=rm_items)
+ make_stock_transfer_entry(
+ sco_no=sco.name,
+ rm_items=rm_items,
+ itemwise_details=copy.deepcopy(itemwise_details),
+ )
+
+ scr = make_subcontracting_receipt(sco.name)
+ additional_costs_expense_account = "Expenses Included In Valuation - TCP1"
+ scr.append(
+ "additional_costs",
+ {
+ "expense_account": additional_costs_expense_account,
+ "description": "Test Additional Costs",
+ "amount": 100,
+ "base_amount": 100,
+ },
+ )
+ scr.save()
+ scr.submit()
+
+ self.assertEqual(cint(erpnext.is_perpetual_inventory_enabled(scr.company)), 1)
+
+ gl_entries = get_gl_entries("Subcontracting Receipt", scr.name)
+
+ self.assertTrue(gl_entries)
+
+ fg_warehouse_ac = get_inventory_account(scr.company, scr.items[0].warehouse)
+ supplier_warehouse_ac = get_inventory_account(scr.company, scr.supplier_warehouse)
+ expense_account = scr.items[0].expense_account
+
+ if fg_warehouse_ac == supplier_warehouse_ac:
+ expected_values = {
+ fg_warehouse_ac: [2100.0, 1000.0], # FG Amount (D), RM Cost (C)
+ expense_account: [0.0, 1000.0], # Service Cost (C)
+ additional_costs_expense_account: [0.0, 100.0], # Additional Cost (C)
+ }
+ else:
+ expected_values = {
+ fg_warehouse_ac: [2100.0, 0.0], # FG Amount (D)
+ supplier_warehouse_ac: [0.0, 1000.0], # RM Cost (C)
+ expense_account: [0.0, 1000.0], # Service Cost (C)
+ additional_costs_expense_account: [0.0, 100.0], # Additional Cost (C)
+ }
+
+ for gle in gl_entries:
+ self.assertEqual(expected_values[gle.account][0], gle.debit)
+ self.assertEqual(expected_values[gle.account][1], gle.credit)
+
+ scr.reload()
+ scr.cancel()
+ self.assertTrue(get_gl_entries("Subcontracting Receipt", scr.name))
+
def make_return_subcontracting_receipt(**args):
args = frappe._dict(args)