fix: not able to submit landed cost voucher (#41481)
(cherry picked from commit 81a9521f04)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
@@ -205,6 +205,7 @@ class StockController(AccountsController):
|
|||||||
"company": self.company,
|
"company": self.company,
|
||||||
"is_rejected": 1 if row.get("rejected_warehouse") else 0,
|
"is_rejected": 1 if row.get("rejected_warehouse") else 0,
|
||||||
"use_serial_batch_fields": row.use_serial_batch_fields,
|
"use_serial_batch_fields": row.use_serial_batch_fields,
|
||||||
|
"via_landed_cost_voucher": via_landed_cost_voucher,
|
||||||
"do_not_submit": True if not via_landed_cost_voucher else False,
|
"do_not_submit": True if not via_landed_cost_voucher else False,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -946,6 +946,128 @@ class TestLandedCostVoucher(FrappeTestCase):
|
|||||||
frappe.db.get_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "avg_rate"),
|
frappe.db.get_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "avg_rate"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_do_not_validate_against_landed_cost_voucher_for_serial_for_legacy_pr(self):
|
||||||
|
from erpnext.stock.doctype.item.test_item import make_item
|
||||||
|
from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import get_auto_batch_nos
|
||||||
|
|
||||||
|
frappe.flags.ignore_serial_batch_bundle_validation = True
|
||||||
|
frappe.flags.use_serial_and_batch_fields = True
|
||||||
|
sn_item = "Test Don't Validate Against LCV For Serial NO for Legacy PR"
|
||||||
|
sn_item_doc = make_item(
|
||||||
|
sn_item,
|
||||||
|
{
|
||||||
|
"has_serial_no": 1,
|
||||||
|
"serial_no_series": "SN-ALCVTDVLCVSNO-.####",
|
||||||
|
"is_stock_item": 1,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
serial_nos = [
|
||||||
|
"SN-ALCVTDVLCVSNO-0001",
|
||||||
|
"SN-ALCVTDVLCVSNO-0002",
|
||||||
|
"SN-ALCVTDVLCVSNO-0003",
|
||||||
|
"SN-ALCVTDVLCVSNO-0004",
|
||||||
|
"SN-ALCVTDVLCVSNO-0005",
|
||||||
|
]
|
||||||
|
|
||||||
|
for sn in serial_nos:
|
||||||
|
if not frappe.db.exists("Serial No", sn):
|
||||||
|
sn_doc = frappe.get_doc(
|
||||||
|
{
|
||||||
|
"doctype": "Serial No",
|
||||||
|
"item_code": sn_item,
|
||||||
|
"serial_no": sn,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
sn_doc.insert()
|
||||||
|
|
||||||
|
warehouse = "_Test Warehouse - _TC"
|
||||||
|
company = frappe.db.get_value("Warehouse", warehouse, "company")
|
||||||
|
|
||||||
|
pr = make_purchase_receipt(
|
||||||
|
company=company,
|
||||||
|
warehouse=warehouse,
|
||||||
|
item_code=sn_item,
|
||||||
|
qty=5,
|
||||||
|
rate=100,
|
||||||
|
uom=sn_item_doc.stock_uom,
|
||||||
|
stock_uom=sn_item_doc.stock_uom,
|
||||||
|
)
|
||||||
|
|
||||||
|
pr.reload()
|
||||||
|
|
||||||
|
for sn in serial_nos:
|
||||||
|
sn_doc = frappe.get_doc("Serial No", sn)
|
||||||
|
sn_doc.db_set(
|
||||||
|
{
|
||||||
|
"warehouse": warehouse,
|
||||||
|
"status": "Active",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
for row in pr.items:
|
||||||
|
if row.item_code == sn_item:
|
||||||
|
row.db_set("serial_no", ", ".join(serial_nos))
|
||||||
|
|
||||||
|
stock_ledger_entries = frappe.get_all("Stock Ledger Entry", filters={"voucher_no": pr.name})
|
||||||
|
for sle in stock_ledger_entries:
|
||||||
|
doc = frappe.get_doc("Stock Ledger Entry", sle.name)
|
||||||
|
if doc.item_code == sn_item:
|
||||||
|
doc.db_set("serial_no", ", ".join(serial_nos))
|
||||||
|
|
||||||
|
dn = create_delivery_note(
|
||||||
|
company=company,
|
||||||
|
warehouse=warehouse,
|
||||||
|
item_code=sn_item,
|
||||||
|
qty=5,
|
||||||
|
rate=100,
|
||||||
|
uom=sn_item_doc.stock_uom,
|
||||||
|
stock_uom=sn_item_doc.stock_uom,
|
||||||
|
)
|
||||||
|
|
||||||
|
stock_ledger_entries = frappe.get_all("Stock Ledger Entry", filters={"voucher_no": dn.name})
|
||||||
|
for sle in stock_ledger_entries:
|
||||||
|
doc = frappe.get_doc("Stock Ledger Entry", sle.name)
|
||||||
|
if doc.item_code == sn_item:
|
||||||
|
doc.db_set("serial_no", ", ".join(serial_nos))
|
||||||
|
|
||||||
|
frappe.flags.ignore_serial_batch_bundle_validation = False
|
||||||
|
frappe.flags.use_serial_and_batch_fields = False
|
||||||
|
|
||||||
|
lcv = make_landed_cost_voucher(
|
||||||
|
company=pr.company,
|
||||||
|
receipt_document_type="Purchase Receipt",
|
||||||
|
receipt_document=pr.name,
|
||||||
|
charges=20,
|
||||||
|
distribute_charges_based_on="Qty",
|
||||||
|
do_not_save=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
lcv.get_items_from_purchase_receipts()
|
||||||
|
lcv.save()
|
||||||
|
lcv.submit()
|
||||||
|
|
||||||
|
pr.reload()
|
||||||
|
|
||||||
|
for row in pr.items:
|
||||||
|
self.assertEqual(row.valuation_rate, 104)
|
||||||
|
self.assertTrue(row.serial_and_batch_bundle)
|
||||||
|
self.assertEqual(
|
||||||
|
row.valuation_rate,
|
||||||
|
frappe.db.get_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "avg_rate"),
|
||||||
|
)
|
||||||
|
|
||||||
|
lcv.cancel()
|
||||||
|
pr.reload()
|
||||||
|
|
||||||
|
for row in pr.items:
|
||||||
|
self.assertEqual(row.valuation_rate, 100)
|
||||||
|
self.assertTrue(row.serial_and_batch_bundle)
|
||||||
|
self.assertEqual(
|
||||||
|
row.valuation_rate,
|
||||||
|
frappe.db.get_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "avg_rate"),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def make_landed_cost_voucher(**args):
|
def make_landed_cost_voucher(**args):
|
||||||
args = frappe._dict(args)
|
args = frappe._dict(args)
|
||||||
|
|||||||
@@ -428,6 +428,9 @@ class SerialandBatchBundle(Document):
|
|||||||
self.throw_error_message(f"The {self.voucher_type} # {self.voucher_no} should be submit first.")
|
self.throw_error_message(f"The {self.voucher_type} # {self.voucher_no} should be submit first.")
|
||||||
|
|
||||||
def check_future_entries_exists(self):
|
def check_future_entries_exists(self):
|
||||||
|
if self.flags and self.flags.via_landed_cost_voucher:
|
||||||
|
return
|
||||||
|
|
||||||
if not self.has_serial_no:
|
if not self.has_serial_no:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -840,6 +840,9 @@ class SerialBatchCreation:
|
|||||||
self.set_auto_serial_batch_entries_for_inward()
|
self.set_auto_serial_batch_entries_for_inward()
|
||||||
self.add_serial_nos_for_batch_item()
|
self.add_serial_nos_for_batch_item()
|
||||||
|
|
||||||
|
if hasattr(self, "via_landed_cost_voucher") and self.via_landed_cost_voucher:
|
||||||
|
doc.flags.via_landed_cost_voucher = self.via_landed_cost_voucher
|
||||||
|
|
||||||
self.set_serial_batch_entries(doc)
|
self.set_serial_batch_entries(doc)
|
||||||
if not doc.get("entries"):
|
if not doc.get("entries"):
|
||||||
return frappe._dict({})
|
return frappe._dict({})
|
||||||
|
|||||||
Reference in New Issue
Block a user