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

Merge pull request #36328 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel-develop

Browse Source 
fix: timeout error while cancelling the Purchase Receipt
This commit is contained in:
rohitwaghchaure 2023-07-27 23:26:59 +05:30 committed by GitHub
commit dac9fd64a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -443,7 +443,8 @@
"hidden": 1,
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "col_br_wh",
@ -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",
@ -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",

8
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@ -604,7 +604,8 @@
"hidden": 1,
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "col_break5",
@ -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",

8
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@ -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",
@ -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",

8
erpnext/stock/doctype/pick_list_item/pick_list_item.json
View File

@ -83,7 +83,8 @@
"fieldtype": "Link",
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"fieldname": "column_break_2",
@ -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",
@ -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",

9
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -502,7 +502,6 @@
{
"fieldname": "rejected_warehouse",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Rejected Warehouse",
"no_copy": 1,
"oldfieldname": "rejected_warehouse",
@ -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",
@ -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",
@ -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",

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

@ -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",
@ -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",
@ -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",
@ -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",

8
erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
View File

@ -173,7 +173,8 @@
"fieldtype": "Link",
"label": "Batch No",
"options": "Batch",
"read_only": 1
"read_only": 1,
"search_index": 1
},
{
"default": "0",
@ -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",
@ -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",