From c16c41ee593bfafa4c5563f527babdb4c16b309a Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Thu, 23 May 2024 16:36:41 +0530 Subject: [PATCH 1/3] fix: add in some indices to speed up Purchase Order deletion `tabSales Order`.`inter_company_order_reference` `tabSales Invoice Item`.`purchase_order` Signed-off-by: Akhil Narang (cherry picked from commit 0303d7dbdc7a84679034e5ba793a13823a7c8f24) # Conflicts: # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/selling/doctype/sales_order/sales_order.json --- .../doctype/sales_invoice_item/sales_invoice_item.json | 7 ++++++- erpnext/selling/doctype/sales_order/sales_order.json | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 87cf1ae80d6..29261e47627 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -867,7 +867,8 @@ "label": "Purchase Order", "options": "Purchase Order", "print_hide": 1, - "read_only": 1 + "read_only": 1, + "search_index": 1 }, { "fieldname": "column_break_92", @@ -892,7 +893,11 @@ "idx": 1, "istable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-11-14 18:34:10.479329", +======= + "modified": "2024-05-23 16:36:18.970862", +>>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 09b73878aa2..b3fb51c4fb8 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1138,7 +1138,8 @@ "hide_seconds": 1, "label": "Inter Company Order Reference", "options": "Purchase Order", - "read_only": 1 + "read_only": 1, + "search_index": 1 }, { "fieldname": "project", @@ -1631,7 +1632,11 @@ "idx": 105, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2024-03-20 16:04:43.627183", +======= + "modified": "2024-05-23 16:35:54.905804", +>>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", From f1f2f6e3388df52cc883805d4b8d0195728abf81 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Fri, 24 May 2024 11:05:45 +0530 Subject: [PATCH 2/3] chore: resolve conflicts --- .../doctype/sales_invoice_item/sales_invoice_item.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 29261e47627..5e7a75b8a3f 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -893,11 +893,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-11-14 18:34:10.479329", -======= "modified": "2024-05-23 16:36:18.970862", ->>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice Item", From 220ae118e816a2a1a1f0a1fbc387315fca5d68af Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Fri, 24 May 2024 11:08:53 +0530 Subject: [PATCH 3/3] chore: resolve conflicts --- erpnext/selling/doctype/sales_order/sales_order.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index b3fb51c4fb8..43e8e41f7f3 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -1632,11 +1632,7 @@ "idx": 105, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2024-03-20 16:04:43.627183", -======= "modified": "2024-05-23 16:35:54.905804", ->>>>>>> 0303d7dbdc (fix: add in some indices to speed up Purchase Order deletion) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", @@ -1715,4 +1711,4 @@ "title_field": "customer_name", "track_changes": 1, "track_seen": 1 -} \ No newline at end of file +}