Skip to content

Commit

Permalink
fix: changed naming series to random for SABB
Browse files Browse the repository at this point in the history
(cherry picked from commit a007dc2)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
  • Loading branch information
rohitwaghchaure authored and mergify[bot] committed Feb 12, 2025
1 parent 68ea528 commit 48a4eff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"actions": [],
"autoname": "naming_series:",
"autoname": "hash",
"creation": "2023-08-11 17:22:12.907518",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"item_details_tab",
"naming_series",
"company",
"item_name",
"has_serial_no",
Expand Down Expand Up @@ -152,20 +151,23 @@
"fieldtype": "Column Break"
},
{
"allow_on_submit": 1,
"fieldname": "avg_rate",
"fieldtype": "Float",
"label": "Avg Rate",
"no_copy": 1,
"read_only": 1
},
{
"allow_on_submit": 1,
"fieldname": "total_amount",
"fieldtype": "Float",
"label": "Total Amount",
"no_copy": 1,
"read_only": 1
},
{
"allow_on_submit": 1,
"fieldname": "total_qty",
"fieldtype": "Float",
"label": "Total Qty",
Expand Down Expand Up @@ -195,12 +197,6 @@
"reqd": 1,
"search_index": 1
},
{
"fieldname": "naming_series",
"fieldtype": "Select",
"label": "Naming Series",
"options": "SABB-.########"
},
{
"default": "0",
"depends_on": "eval:doc.voucher_type == \"Purchase Receipt\"",
Expand Down Expand Up @@ -251,11 +247,15 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"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",
"module": "Stock",
"name": "Serial and Batch Bundle",
"naming_rule": "By \"Naming Series\" field",
"naming_rule": "Random",
"owner": "Administrator",
"permissions": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ class SerialandBatchBundle(Document):
if TYPE_CHECKING:
from frappe.types import DF

from erpnext.stock.doctype.serial_and_batch_entry.serial_and_batch_entry import (
SerialandBatchEntry,
)
from erpnext.stock.doctype.serial_and_batch_entry.serial_and_batch_entry import SerialandBatchEntry

amended_from: DF.Link | None
avg_rate: DF.Float
Expand All @@ -70,7 +68,6 @@ class SerialandBatchBundle(Document):
item_code: DF.Link
item_group: DF.Link | None
item_name: DF.Data | None
naming_series: DF.Literal["SABB-.########"]
posting_date: DF.Date | None
posting_time: DF.Time | None
returned_against: DF.Data | None
Expand Down

0 comments on commit 48a4eff

Please sign in to comment.