nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 17:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: changed naming series to random for SABB

Browse Source 
(cherry picked from commit a007dc285d)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
This commit is contained in:
Rohit Waghchaure
2025-02-12 09:55:20 +05:30
committed by Mergify
parent 68ea528841
commit 48a4effdb6
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
View File

@@ -1,13 +1,12 @@
{ {
"actions": [], "actions": [],
"autoname": "naming_series:", "autoname": "hash",
"creation": "2023-08-11 17:22:12.907518", "creation": "2023-08-11 17:22:12.907518",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"item_details_tab", "item_details_tab",
"naming_series",
"company", "company",
"item_name", "item_name",
"has_serial_no", "has_serial_no",
@@ -152,6 +151,7 @@
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"allow_on_submit": 1,
"fieldname": "avg_rate", "fieldname": "avg_rate",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Avg Rate", "label": "Avg Rate",
@@ -159,6 +159,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"allow_on_submit": 1,
"fieldname": "total_amount", "fieldname": "total_amount",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Total Amount", "label": "Total Amount",
@@ -166,6 +167,7 @@
"read_only": 1 "read_only": 1
}, },
{ {
"allow_on_submit": 1,
"fieldname": "total_qty", "fieldname": "total_qty",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Total Qty", "label": "Total Qty",
@@ -195,12 +197,6 @@
"reqd": 1, "reqd": 1,
"search_index": 1 "search_index": 1
}, },
{
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Naming Series",
"options": "SABB-.########"
},
{ {
"default": "0", "default": "0",
"depends_on": "eval:doc.voucher_type == \"Purchase Receipt\"", "depends_on": "eval:doc.voucher_type == \"Purchase Receipt\"",
@@ -251,11 +247,15 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-15 15:22:24.003486", "modified": "2024-03-15 15:22:24.003486",
=======
"modified": "2025-02-12 09:53:32.090309",
>>>>>>> a007dc285d (fix: changed naming series to random for SABB)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial and Batch Bundle", "name": "Serial and Batch Bundle",
"naming_rule": "By \"Naming Series\" field", "naming_rule": "Random",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {

5
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -55,9 +55,7 @@ class SerialandBatchBundle(Document):
if TYPE_CHECKING: if TYPE_CHECKING:
from frappe.types import DF from frappe.types import DF
from erpnext.stock.doctype.serial_and_batch_entry.serial_and_batch_entry import ( from erpnext.stock.doctype.serial_and_batch_entry.serial_and_batch_entry import SerialandBatchEntry
SerialandBatchEntry,
)
amended_from: DF.Link | None amended_from: DF.Link | None
avg_rate: DF.Float avg_rate: DF.Float
@@ -70,7 +68,6 @@ class SerialandBatchBundle(Document):
item_code: DF.Link item_code: DF.Link
item_group: DF.Link | None item_group: DF.Link | None
item_name: DF.Data | None item_name: DF.Data | None
naming_series: DF.Literal["SABB-.########"]
posting_date: DF.Date | None posting_date: DF.Date | None
posting_time: DF.Time | None posting_time: DF.Time | None
returned_against: DF.Data | None returned_against: DF.Data | None