Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: timeout error while cancelling the Purchase Receipt #36328

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,8 @@
"hidden": 1,
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "col_br_wh",
Expand Down Expand Up @@ -890,7 +891,8 @@
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
"print_hide": 1,
"search_index": 1
},
{
"depends_on": "eval:parent.update_stock == 1",
Expand All @@ -905,7 +907,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2023-07-04 17:22:21.501152",
"modified": "2023-07-26 12:54:53.178156",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,8 @@
"hidden": 1,
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "col_break5",
Expand Down Expand Up @@ -894,13 +895,14 @@
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
"print_hide": 1,
"search_index": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2023-03-12 13:42:24.303113",
"modified": "2023-07-26 12:53:22.404057",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,8 @@
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
"print_hide": 1,
"search_index": 1
},
{
"fieldname": "pick_serial_and_batch",
Expand Down Expand Up @@ -884,14 +885,15 @@
"hidden": 1,
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2023-05-02 21:05:14.175640",
"modified": "2023-07-26 12:53:49.357171",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",
Expand Down
8 changes: 5 additions & 3 deletions erpnext/stock/doctype/pick_list_item/pick_list_item.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
"fieldtype": "Link",
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "column_break_2",
Expand Down Expand Up @@ -199,7 +200,8 @@
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
"print_hide": 1,
"search_index": 1
},
{
"fieldname": "pick_serial_and_batch",
Expand All @@ -209,7 +211,7 @@
],
"istable": 1,
"links": [],
"modified": "2023-06-16 14:05:51.719959",
"modified": "2023-07-26 12:54:15.785962",
"modified_by": "Administrator",
"module": "Stock",
"name": "Pick List Item",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,6 @@
{
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"oldfieldname": "rejected_warehouse",
Expand Down Expand Up @@ -1003,7 +1002,8 @@
"label": "Serial and Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
"print_hide": 1,
"search_index": 1
},
{
"depends_on": "eval:parent.is_old_subcontracting_flow",
Expand All @@ -1028,7 +1028,8 @@
"fieldtype": "Link",
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "rejected_serial_and_batch_bundle",
Expand Down Expand Up @@ -1059,7 +1060,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2023-07-04 17:22:02.830029",
"modified": "2023-07-26 12:55:15.234477",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
"in_list_view": 1,
"label": "Company",
"options": "Company",
"reqd": 1
"reqd": 1,
"search_index": 1
},
{
"fetch_from": "item_code.item_group",
Expand Down Expand Up @@ -78,7 +79,8 @@
"in_standard_filter": 1,
"label": "Item Code",
"options": "Item",
"reqd": 1
"reqd": 1,
"search_index": 1
},
{
"fetch_from": "item_code.item_name",
Expand Down Expand Up @@ -180,14 +182,16 @@
"in_standard_filter": 1,
"label": "Warehouse",
"mandatory_depends_on": "eval:doc.type_of_transaction != \"Maintenance\"",
"options": "Warehouse"
"options": "Warehouse",
"search_index": 1
},
{
"fieldname": "type_of_transaction",
"fieldtype": "Select",
"label": "Type of Transaction",
"options": "\nInward\nOutward\nMaintenance\nAsset Repair",
"reqd": 1
"reqd": 1,
"search_index": 1
},
{
"fieldname": "naming_series",
Expand Down Expand Up @@ -244,7 +248,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2023-07-16 10:53:04.045605",
"modified": "2023-07-26 12:56:03.072224",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial and Batch Bundle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@
"fieldtype": "Link",
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"default": "0",
Expand All @@ -197,7 +198,8 @@
"label": "Serial / Batch Bundle",
"no_copy": 1,
"options": "Serial and Batch Bundle",
"print_hide": 1
"print_hide": 1,
"search_index": 1
},
{
"fieldname": "current_serial_and_batch_bundle",
Expand All @@ -214,7 +216,7 @@
],
"istable": 1,
"links": [],
"modified": "2023-06-15 11:45:55.808942",
"modified": "2023-07-26 12:54:34.011915",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation Item",
Expand Down