From ed679396d4f1fd67a7408e9f663d5a525f17da84 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 18 Jun 2026 12:39:25 +0530 Subject: [PATCH] refactor: maintain sync dependency in report master (cherry picked from commit 5c536b8ad1e7a7c7274cd3f82ac9e9ab2f34891f) # Conflicts: # erpnext/accounts/report/accounts_payable/accounts_payable.json # erpnext/accounts/report/accounts_receivable/accounts_receivable.json # erpnext/accounts/report/general_ledger/general_ledger.json # erpnext/accounts/report/trial_balance/trial_balance.json --- .../accounts_payable/accounts_payable.json | 39 ++++++++++++++++++- .../accounts_receivable.json | 39 ++++++++++++++++++- .../report/general_ledger/general_ledger.json | 18 +++++++++ .../report/trial_balance/trial_balance.json | 38 +++++++++++++++++- 4 files changed, 131 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.json b/erpnext/accounts/report/accounts_payable/accounts_payable.json index 321722a29da..e5d4e4206c1 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.json +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "add_total_row": 1, "apply_user_permissions": 1, "creation": "2013-04-22 16:16:03", @@ -15,6 +16,35 @@ "ref_doctype": "Purchase Invoice", "report_name": "Accounts Payable", "report_type": "Script Report", +======= + "add_total_row": 1, + "add_translate_data": 0, + "columns": [], + "creation": "2013-04-22 16:16:03", + "default_print_format": "Accounts Payable Standard", + "disable_prepared_report_automation": 0, + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "doctype_to_sync": [ + { + "doc_type": "Payment Ledger Entry" + } + ], + "filters": [], + "generate_csv": 0, + "idx": 3, + "is_standard": "Yes", + "modified": "2026-06-18 11:54:12.154865", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Accounts Payable", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "Purchase Invoice", + "report_name": "Accounts Payable", + "report_type": "Script Report", +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) "roles": [ { "role": "Accounts User" @@ -28,5 +58,12 @@ { "role": "Auditor" } +<<<<<<< HEAD ] -} \ No newline at end of file +} +======= + ], + "synced_report": 1, + "timeout": 0 +} +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.json b/erpnext/accounts/report/accounts_receivable/accounts_receivable.json index 1c99ac5f00b..b003e237ae2 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.json +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "add_total_row": 1, "apply_user_permissions": 1, "creation": "2013-04-16 11:31:13", @@ -15,6 +16,35 @@ "ref_doctype": "Sales Invoice", "report_name": "Accounts Receivable", "report_type": "Script Report", +======= + "add_total_row": 1, + "add_translate_data": 0, + "columns": [], + "creation": "2013-04-16 11:31:13", + "default_print_format": "Accounts Receivable Standard", + "disable_prepared_report_automation": 0, + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "doctype_to_sync": [ + { + "doc_type": "Payment Ledger Entry" + } + ], + "filters": [], + "generate_csv": 0, + "idx": 5, + "is_standard": "Yes", + "modified": "2026-06-18 11:53:59.190645", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Accounts Receivable", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "Sales Invoice", + "report_name": "Accounts Receivable", + "report_type": "Script Report", +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) "roles": [ { "role": "Accounts Manager" @@ -22,5 +52,12 @@ { "role": "Accounts User" } +<<<<<<< HEAD ] -} \ No newline at end of file +} +======= + ], + "synced_report": 1, + "timeout": 0 +} +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.json b/erpnext/accounts/report/general_ledger/general_ledger.json index a49f6356122..ecfb2a6c0db 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.json +++ b/erpnext/accounts/report/general_ledger/general_ledger.json @@ -3,14 +3,31 @@ "add_translate_data": 0, "columns": [], "creation": "2013-12-06 13:22:23", +<<<<<<< HEAD +======= + "default_print_format": "General Ledger Standard", + "disable_prepared_report_automation": 0, +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) "disabled": 0, "docstatus": 0, "doctype": "Report", + "doctype_to_sync": [ + { + "doc_type": "GL Entry" + } + ], "filters": [], +<<<<<<< HEAD "idx": 3, "is_standard": "Yes", "letterhead": null, "modified": "2025-11-05 15:47:59.597853", +======= + "generate_csv": 0, + "idx": 4, + "is_standard": "Yes", + "modified": "2026-06-18 11:53:29.057634", +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) "modified_by": "Administrator", "module": "Accounts", "name": "General Ledger", @@ -30,5 +47,6 @@ "role": "Auditor" } ], + "synced_report": 1, "timeout": 0 } diff --git a/erpnext/accounts/report/trial_balance/trial_balance.json b/erpnext/accounts/report/trial_balance/trial_balance.json index af586f7f17d..bc555c0638b 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.json +++ b/erpnext/accounts/report/trial_balance/trial_balance.json @@ -1,4 +1,5 @@ { +<<<<<<< HEAD "add_total_row": 0, "apply_user_permissions": 1, "creation": "2014-07-22 11:41:23.743564", @@ -14,6 +15,34 @@ "owner": "Administrator", "ref_doctype": "GL Entry", "report_name": "Trial Balance", +======= + "add_total_row": 0, + "add_translate_data": 0, + "columns": [], + "creation": "2014-07-22 11:41:23.743564", + "default_print_format": "Trial Balance Standard", + "disable_prepared_report_automation": 0, + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "doctype_to_sync": [ + { + "doc_type": "GL Entry" + } + ], + "filters": [], + "generate_csv": 0, + "idx": 4, + "is_standard": "Yes", + "modified": "2026-06-18 11:41:42.774023", + "modified_by": "Administrator", + "module": "Accounts", + "name": "Trial Balance", + "owner": "Administrator", + "prepared_report": 0, + "ref_doctype": "GL Entry", + "report_name": "Trial Balance", +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) "report_type": "Script Report", "roles": [ { @@ -25,5 +54,12 @@ { "role": "Auditor" } +<<<<<<< HEAD ] -} \ No newline at end of file +} +======= + ], + "synced_report": 1, + "timeout": 0 +} +>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master)