Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27962 from marination/clean-serial-no-logic

Browse Source 
fix: Retain space inside Serial no string while cleaning serial nos
This commit is contained in:
Marica 2021-10-14 20:17:42 +05:30 committed by GitHub
commit c0e632842a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/stock_controller.py
View File

@ -79,8 +79,15 @@ class StockController(AccountsController):
def clean_serial_nos(self): def clean_serial_nos(self):
for row in self.get("items"): for row in self.get("items"):
if hasattr(row, "serial_no") and row.serial_no: if hasattr(row, "serial_no") and row.serial_no:
# replace commas by linefeed and remove all spaces in string # replace commas by linefeed
row.serial_no = row.serial_no.replace(",", "\n").replace(" ", "") row.serial_no = row.serial_no.replace(",", "\n")
# strip preceeding and succeeding spaces for each SN
# (SN could have valid spaces in between e.g. SN - 123 - 2021)
serial_no_list = row.serial_no.split("\n")
serial_no_list = [sn.strip() for sn in serial_no_list]
row.serial_no = "\n".join(serial_no_list)
def get_gl_entries(self, warehouse_account=None, default_expense_account=None, def get_gl_entries(self, warehouse_account=None, default_expense_account=None,
default_cost_center=None): default_cost_center=None):

8
erpnext/stock/doctype/serial_no/test_serial_no.py
View File

@ -184,14 +184,14 @@ class TestSerialNo(ERPNextTestCase):
se = frappe.copy_doc(test_records[0]) se = frappe.copy_doc(test_records[0])
se.get("items")[0].item_code = item_code se.get("items")[0].item_code = item_code
se.get("items")[0].qty = 3 se.get("items")[0].qty = 4
se.get("items")[0].serial_no = " _TS1, _TS2 , _TS3 " se.get("items")[0].serial_no = " _TS1, _TS2 , _TS3 , _TS4 - 2021"
se.get("items")[0].transfer_qty = 3 se.get("items")[0].transfer_qty = 4
se.set_stock_entry_type() se.set_stock_entry_type()
se.insert() se.insert()
se.submit() se.submit()
self.assertEqual(se.get("items")[0].serial_no, "_TS1\n_TS2\n_TS3") self.assertEqual(se.get("items")[0].serial_no, "_TS1\n_TS2\n_TS3\n_TS4 - 2021")
frappe.db.rollback() frappe.db.rollback()