fix: Data too long for column 'serial_no' at row 1 (#40098)

This commit is contained in:
rohitwaghchaure 2024-02-26 18:49:56 +05:30 committed by GitHub
parent 122373fcd3
commit 08caa7cfa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 40 additions and 16 deletions

View File

@ -654,7 +654,7 @@
{ {
"depends_on": "eval:doc.use_serial_batch_fields === 1", "depends_on": "eval:doc.use_serial_batch_fields === 1",
"fieldname": "serial_no", "fieldname": "serial_no",
"fieldtype": "Small Text", "fieldtype": "Text",
"hidden": 1, "hidden": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Serial No", "label": "Serial No",
@ -853,7 +853,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-04 16:36:25.665743", "modified": "2024-02-25 15:50:17.140269",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Invoice Item", "name": "POS Invoice Item",

View File

@ -72,7 +72,7 @@ class POSInvoiceItem(Document):
rate_with_margin: DF.Currency rate_with_margin: DF.Currency
sales_order: DF.Link | None sales_order: DF.Link | None
serial_and_batch_bundle: DF.Link | None serial_and_batch_bundle: DF.Link | None
serial_no: DF.SmallText | None serial_no: DF.Text | None
service_end_date: DF.Date | None service_end_date: DF.Date | None
service_start_date: DF.Date | None service_start_date: DF.Date | None
service_stop_date: DF.Date | None service_stop_date: DF.Date | None

View File

@ -625,7 +625,7 @@
{ {
"depends_on": "eval: doc.use_serial_batch_fields === 1 && parent.update_stock === 1", "depends_on": "eval: doc.use_serial_batch_fields === 1 && parent.update_stock === 1",
"fieldname": "serial_no", "fieldname": "serial_no",
"fieldtype": "Small Text", "fieldtype": "Text",
"label": "Serial No", "label": "Serial No",
"oldfieldname": "serial_no", "oldfieldname": "serial_no",
"oldfieldtype": "Small Text" "oldfieldtype": "Small Text"
@ -926,7 +926,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-04 11:52:16.106541", "modified": "2024-02-25 15:56:44.828634",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",

View File

@ -75,7 +75,7 @@ class SalesInvoiceItem(Document):
sales_invoice_item: DF.Data | None sales_invoice_item: DF.Data | None
sales_order: DF.Link | None sales_order: DF.Link | None
serial_and_batch_bundle: DF.Link | None serial_and_batch_bundle: DF.Link | None
serial_no: DF.SmallText | None serial_no: DF.Text | None
service_end_date: DF.Date | None service_end_date: DF.Date | None
service_start_date: DF.Date | None service_start_date: DF.Date | None
service_stop_date: DF.Date | None service_stop_date: DF.Date | None

View File

@ -107,7 +107,7 @@
{ {
"depends_on": "eval:doc.use_serial_batch_fields === 1", "depends_on": "eval:doc.use_serial_batch_fields === 1",
"fieldname": "serial_no", "fieldname": "serial_no",
"fieldtype": "Small Text", "fieldtype": "Text",
"hidden": 1, "hidden": 1,
"label": "Serial No", "label": "Serial No",
"print_hide": 1 "print_hide": 1
@ -178,7 +178,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-04 16:41:09.239762", "modified": "2024-02-25 15:57:35.007501",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Capitalization Stock Item", "name": "Asset Capitalization Stock Item",

View File

@ -24,7 +24,7 @@ class AssetCapitalizationStockItem(Document):
parentfield: DF.Data parentfield: DF.Data
parenttype: DF.Data parenttype: DF.Data
serial_and_batch_bundle: DF.Link | None serial_and_batch_bundle: DF.Link | None
serial_no: DF.SmallText | None serial_no: DF.Text | None
stock_qty: DF.Float stock_qty: DF.Float
stock_uom: DF.Link stock_uom: DF.Link
use_serial_batch_fields: DF.Check use_serial_batch_fields: DF.Check

View File

@ -2237,6 +2237,10 @@ class TestPurchaseReceipt(FrappeTestCase):
create_stock_reconciliation, create_stock_reconciliation,
) )
frappe.db.set_single_value(
"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle", 0
)
item_code = make_item( item_code = make_item(
"_Test Use Serial Fields Item Serial Item", "_Test Use Serial Fields Item Serial Item",
properties={"has_serial_no": 1, "serial_no_series": "SNU-TSFISI-.#####"}, properties={"has_serial_no": 1, "serial_no_series": "SNU-TSFISI-.#####"},
@ -2317,6 +2321,10 @@ class TestPurchaseReceipt(FrappeTestCase):
serial_no_status = frappe.db.get_value("Serial No", sn, "status") serial_no_status = frappe.db.get_value("Serial No", sn, "status")
self.assertTrue(serial_no_status != "Active") self.assertTrue(serial_no_status != "Active")
frappe.db.set_single_value(
"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle", 1
)
def test_sle_qty_after_transaction(self): def test_sle_qty_after_transaction(self):
item = make_item( item = make_item(
"_Test Item Qty After Transaction", "_Test Item Qty After Transaction",
@ -2416,7 +2424,9 @@ class TestPurchaseReceipt(FrappeTestCase):
}, },
).name ).name
frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1) frappe.db.set_single_value(
"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle", 0
)
pr = make_purchase_receipt( pr = make_purchase_receipt(
item_code=item_code, item_code=item_code,
@ -2428,7 +2438,9 @@ class TestPurchaseReceipt(FrappeTestCase):
batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle) batch_no = get_batch_from_bundle(pr.items[0].serial_and_batch_bundle)
self.assertEqual(pr.items[0].batch_no, batch_no) self.assertEqual(pr.items[0].batch_no, batch_no)
frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0) frappe.db.set_single_value(
"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle", 1
)
def prepare_data_for_internal_transfer(): def prepare_data_for_internal_transfer():

View File

@ -294,7 +294,7 @@
{ {
"depends_on": "eval:doc.use_serial_batch_fields === 1", "depends_on": "eval:doc.use_serial_batch_fields === 1",
"fieldname": "serial_no", "fieldname": "serial_no",
"fieldtype": "Small Text", "fieldtype": "Text",
"label": "Serial No", "label": "Serial No",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "serial_no", "oldfieldname": "serial_no",
@ -610,7 +610,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-04 16:16:47.606270", "modified": "2024-02-25 15:58:40.982582",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",

View File

@ -54,7 +54,7 @@ class StockEntryDetail(Document):
sample_quantity: DF.Int sample_quantity: DF.Int
sco_rm_detail: DF.Data | None sco_rm_detail: DF.Data | None
serial_and_batch_bundle: DF.Link | None serial_and_batch_bundle: DF.Link | None
serial_no: DF.SmallText | None serial_no: DF.Text | None
set_basic_rate_manually: DF.Check set_basic_rate_manually: DF.Check
ste_detail: DF.Data | None ste_detail: DF.Data | None
stock_uom: DF.Link stock_uom: DF.Link

View File

@ -51,6 +51,7 @@
"use_naming_series", "use_naming_series",
"naming_series_prefix", "naming_series_prefix",
"use_serial_batch_fields", "use_serial_batch_fields",
"do_not_update_serial_batch_on_creation_of_auto_bundle",
"stock_planning_tab", "stock_planning_tab",
"auto_material_request", "auto_material_request",
"auto_indent", "auto_indent",
@ -428,6 +429,14 @@
"fieldname": "use_serial_batch_fields", "fieldname": "use_serial_batch_fields",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Use Serial / Batch Fields" "label": "Use Serial / Batch Fields"
},
{
"default": "1",
"depends_on": "use_serial_batch_fields",
"description": "If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n / Batch Bundle. ",
"fieldname": "do_not_update_serial_batch_on_creation_of_auto_bundle",
"fieldtype": "Check",
"label": "Do Not Update Serial / Batch on Creation of Auto Bundle"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@ -435,7 +444,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2024-02-24 12:50:51.740097", "modified": "2024-02-25 16:32:01.084453",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",

View File

@ -39,6 +39,7 @@ class StockSettings(Document):
clean_description_html: DF.Check clean_description_html: DF.Check
default_warehouse: DF.Link | None default_warehouse: DF.Link | None
disable_serial_no_and_batch_selector: DF.Check disable_serial_no_and_batch_selector: DF.Check
do_not_update_serial_batch_on_creation_of_auto_bundle: DF.Check
enable_stock_reservation: DF.Check enable_stock_reservation: DF.Check
item_group: DF.Link | None item_group: DF.Link | None
item_naming_by: DF.Literal["Item Code", "Naming Series"] item_naming_by: DF.Literal["Item Code", "Naming Series"]

View File

@ -142,7 +142,9 @@ class SerialBatchBundle:
"serial_and_batch_bundle": sn_doc.name, "serial_and_batch_bundle": sn_doc.name,
} }
if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"): if not frappe.db.get_single_value(
"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle"
):
if sn_doc.has_serial_no: if sn_doc.has_serial_no:
values_to_update["serial_no"] = ",".join(cstr(d.serial_no) for d in sn_doc.entries) values_to_update["serial_no"] = ",".join(cstr(d.serial_no) for d in sn_doc.entries)
elif sn_doc.has_batch_no and len(sn_doc.entries) == 1: elif sn_doc.has_batch_no and len(sn_doc.entries) == 1: