Skip to content

Commit

Permalink
fix: Duplicate Serial Nos validation in POS (#36927)
Browse files Browse the repository at this point in the history
* fix: added validation for duplicate serial nos in pos

* chore: code cleanup

* chore: code cleanup

* fix: removed duplicate batch number validation

* chore: code cleanup
  • Loading branch information
RitvikSardana authored Sep 18, 2023
1 parent e62b783 commit 366325c
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 11 deletions.
15 changes: 4 additions & 11 deletions erpnext/accounts/doctype/pos_invoice/pos_invoice.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
# For license information, please see license.txt


import collections

import frappe
Expand Down Expand Up @@ -43,7 +45,6 @@ def validate(self):
self.validate_debit_to_acc()
self.validate_write_off_account()
self.validate_change_amount()
self.validate_duplicate_serial_and_batch_no()
self.validate_change_account()
self.validate_item_cost_centers()
self.validate_warehouse()
Expand All @@ -56,6 +57,7 @@ def validate(self):
self.validate_payment_amount()
self.validate_loyalty_transaction()
self.validate_company_with_pos_company()
self.validate_duplicate_serial_no()
if self.coupon_code:
from erpnext.accounts.doctype.pricing_rule.utils import validate_coupon_code

Expand Down Expand Up @@ -156,27 +158,18 @@ def validate_pos_reserved_serial_nos(self, item):
title=_("Item Unavailable"),
)

def validate_duplicate_serial_and_batch_no(self):
def validate_duplicate_serial_no(self):
serial_nos = []
batch_nos = []

for row in self.get("items"):
if row.serial_no:
serial_nos = row.serial_no.split("\n")

if row.batch_no and not row.serial_no:
batch_nos.append(row.batch_no)

if serial_nos:
for key, value in collections.Counter(serial_nos).items():
if value > 1:
frappe.throw(_("Duplicate Serial No {0} found").format("key"))

if batch_nos:
for key, value in collections.Counter(batch_nos).items():
if value > 1:
frappe.throw(_("Duplicate Batch No {0} found").format("key"))

def validate_pos_reserved_batch_qty(self, item):
filters = {"item_code": item.item_code, "warehouse": item.warehouse, "batch_no": item.batch_no}

Expand Down
31 changes: 31 additions & 0 deletions erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,37 @@ def test_delivered_serialized_item_transaction(self):
pos2.insert()
self.assertRaises(frappe.ValidationError, pos2.submit)

def test_pos_invoice_with_duplicate_serial_no(self):
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item

se = make_serialized_item(
company="_Test Company",
target_warehouse="Stores - _TC",
cost_center="Main - _TC",
expense_account="Cost of Goods Sold - _TC",
)

serial_nos = get_serial_nos(se.get("items")[0].serial_no)

pos = create_pos_invoice(
company="_Test Company",
debit_to="Debtors - _TC",
account_for_change_amount="Cash - _TC",
warehouse="Stores - _TC",
income_account="Sales - _TC",
expense_account="Cost of Goods Sold - _TC",
cost_center="Main - _TC",
item=se.get("items")[0].item_code,
rate=1000,
qty=2,
do_not_save=1,
)

pos.get("items")[0].has_serial_no = 1
pos.get("items")[0].serial_no = serial_nos[0] + "\n" + serial_nos[0]
self.assertRaises(frappe.ValidationError, pos.submit)

def test_invalid_serial_no_validation(self):
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item

Expand Down

0 comments on commit 366325c

Please sign in to comment.