Merge pull request #37513 from s-aga-r/FIX-4388

fix: GL Entries not getting created for PR Return
This commit is contained in:
s-aga-r 2023-10-16 00:33:21 +05:30 committed by GitHub
commit 0f6d67d8d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 1 deletions

View File

@ -339,7 +339,7 @@ class PurchaseReceipt(BuyingController):
exchange_rate_map, net_rate_map = get_purchase_document_details(self) exchange_rate_map, net_rate_map = get_purchase_document_details(self)
for d in self.get("items"): for d in self.get("items"):
if d.item_code in stock_items and flt(d.valuation_rate) and flt(d.qty): if d.item_code in stock_items and flt(d.qty) and (flt(d.valuation_rate) or self.is_return):
if warehouse_account.get(d.warehouse): if warehouse_account.get(d.warehouse):
stock_value_diff = frappe.db.get_value( stock_value_diff = frappe.db.get_value(
"Stock Ledger Entry", "Stock Ledger Entry",

View File

@ -2086,6 +2086,64 @@ class TestPurchaseReceipt(FrappeTestCase):
return_pr.reload() return_pr.reload()
self.assertEqual(return_pr.status, "Completed") self.assertEqual(return_pr.status, "Completed")
def test_purchase_return_with_zero_rate(self):
company = "_Test Company with perpetual inventory"
# Step - 1: Create Item
item, warehouse = (
make_item(properties={"is_stock_item": 1, "valuation_method": "Moving Average"}).name,
"Stores - TCP1",
)
# Step - 2: Create Stock Entry (Material Receipt)
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
se = make_stock_entry(
purpose="Material Receipt",
item_code=item,
qty=100,
basic_rate=100,
to_warehouse=warehouse,
company=company,
)
# Step - 3: Create Purchase Receipt
pr = make_purchase_receipt(
item_code=item,
qty=5,
rate=0,
warehouse=warehouse,
company=company,
)
# Step - 4: Create Purchase Return
from erpnext.controllers.sales_and_purchase_return import make_return_doc
pr_return = make_return_doc("Purchase Receipt", pr.name)
pr_return.save()
pr_return.submit()
sl_entries = get_sl_entries(pr_return.doctype, pr_return.name)
gl_entries = get_gl_entries(pr_return.doctype, pr_return.name)
# Test - 1: SLE Stock Value Difference should be equal to Qty * Average Rate
average_rate = (
(se.items[0].qty * se.items[0].basic_rate) + (pr.items[0].qty * pr.items[0].rate)
) / (se.items[0].qty + pr.items[0].qty)
expected_stock_value_difference = pr_return.items[0].qty * average_rate
self.assertEqual(
flt(sl_entries[0].stock_value_difference, 2), flt(expected_stock_value_difference, 2)
)
# Test - 2: GL Entries should be created for Stock Value Difference
self.assertEqual(len(gl_entries), 2)
# Test - 3: SLE Stock Value Difference should be equal to Debit or Credit of GL Entries.
for entry in gl_entries:
self.assertEqual(abs(entry.debit + entry.credit), abs(sl_entries[0].stock_value_difference))
self.assertIsNotNone(get_gl_entries(pr_return.doctype, pr_return.name))
def prepare_data_for_internal_transfer(): def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier