From 7cc6035fa67cc9205961aaeff2d61319affa6214 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 13 Jul 2026 15:39:54 +0530 Subject: [PATCH] chore: resolve conflicts --- .../accounts_payable/accounts_payable.json | 32 +------------------ .../accounts_receivable.json | 32 +------------------ .../report/balance_sheet/balance_sheet.json | 32 +------------------ .../report/general_ledger/general_ledger.json | 21 ------------ .../profit_and_loss_statement.json | 31 +----------------- .../report/trial_balance/trial_balance.json | 31 +----------------- 6 files changed, 5 insertions(+), 174 deletions(-) diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.json b/erpnext/accounts/report/accounts_payable/accounts_payable.json index a2b5c8b7f14..6695d8a5799 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.json +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "add_total_row": 1, "apply_user_permissions": 1, "creation": "2013-04-22 16:16:03", @@ -8,7 +7,7 @@ "doctype": "Report", "idx": 3, "is_standard": "Yes", - "modified": "2017-02-24 20:09:46.150861", + "modified": "2026-06-25 12:03:36.559152", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Payable", @@ -16,35 +15,11 @@ "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-25 12:03:36.559152", - "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" @@ -58,12 +33,7 @@ { "role": "Auditor" } -<<<<<<< HEAD - ] -} -======= ], "synced_report": 0, "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 ff2c4256c2b..91f4c1167cc 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.json +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "add_total_row": 1, "apply_user_permissions": 1, "creation": "2013-04-16 11:31:13", @@ -8,7 +7,7 @@ "doctype": "Report", "idx": 3, "is_standard": "Yes", - "modified": "2017-03-06 05:52:06.235584", + "modified": "2026-06-25 12:03:28.812092", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Receivable", @@ -16,35 +15,11 @@ "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-25 12:03:28.812092", - "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" @@ -52,12 +27,7 @@ { "role": "Accounts User" } -<<<<<<< HEAD - ] -} -======= ], "synced_report": 0, "timeout": 0 } ->>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.json b/erpnext/accounts/report/balance_sheet/balance_sheet.json index 81c42f87df2..09fa23d4aaf 100644 --- a/erpnext/accounts/report/balance_sheet/balance_sheet.json +++ b/erpnext/accounts/report/balance_sheet/balance_sheet.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "add_total_row": 0, "creation": "2014-07-14 05:24:20.385279", "disabled": 0, @@ -7,7 +6,7 @@ "doctype": "Report", "idx": 2, "is_standard": "Yes", - "modified": "2018-09-07 12:18:21.850851", + "modified": "2026-06-22 13:38:25.236839", "modified_by": "Administrator", "module": "Accounts", "name": "Balance Sheet", @@ -16,35 +15,11 @@ "ref_doctype": "GL Entry", "report_name": "Balance Sheet", "report_type": "Script Report", -======= - "add_total_row": 0, - "add_translate_data": 0, - "columns": [], - "creation": "2014-07-14 05:24:20.385279", - "default_print_format": "Balance Sheet Standard", - "disable_prepared_report_automation": 0, - "disabled": 0, - "docstatus": 0, - "doctype": "Report", "doctype_to_sync": [ { "doc_type": "GL Entry" } ], - "filters": [], - "generate_csv": 0, - "idx": 3, - "is_standard": "Yes", - "modified": "2026-06-22 13:38:25.236839", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Balance Sheet", - "owner": "Administrator", - "prepared_report": 0, - "ref_doctype": "GL Entry", - "report_name": "Balance Sheet", - "report_type": "Script Report", ->>>>>>> bb19540816 (feat(balance-sheet): implement execute_synced_report with full parity to normal report) "roles": [ { "role": "Accounts User" @@ -55,12 +30,7 @@ { "role": "Auditor" } -<<<<<<< HEAD - ] -} -======= ], "synced_report": 0, "timeout": 0 } ->>>>>>> bb19540816 (feat(balance-sheet): implement execute_synced_report with full parity to normal report) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.json b/erpnext/accounts/report/general_ledger/general_ledger.json index 7ccc0db2fbd..a42a5f6195e 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.json +++ b/erpnext/accounts/report/general_ledger/general_ledger.json @@ -3,11 +3,6 @@ "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", @@ -17,25 +12,9 @@ } ], "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", -<<<<<<< HEAD -<<<<<<< HEAD - "modified": "2026-06-18 11:53:29.057634", ->>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master) -======= - "modified": "2026-06-22 11:50:08.020553", ->>>>>>> 6b4895bcc9 (feat(general-ledger): implement execute_synced_report with full parity to normal report) -======= "modified": "2026-06-22 13:38:35.057216", ->>>>>>> 963bbc8729 (refactor: synced reports should be enabled on sites based on requirements) "modified_by": "Administrator", "module": "Accounts", "name": "General Ledger", diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json index e0f2892ac31..67640b52c1b 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "add_total_row": 0, "apply_user_permissions": 1, "creation": "2014-07-18 11:43:33.173207", @@ -8,7 +7,7 @@ "doctype": "Report", "idx": 2, "is_standard": "Yes", - "modified": "2017-02-24 20:12:40.282376", + "modified": "2026-06-22 13:38:15.898375", "modified_by": "Administrator", "module": "Accounts", "name": "Profit and Loss Statement", @@ -16,35 +15,12 @@ "ref_doctype": "GL Entry", "report_name": "Profit and Loss Statement", "report_type": "Script Report", -======= - "add_total_row": 0, - "add_translate_data": 0, - "columns": [], - "creation": "2014-07-18 11:43:33.173207", - "default_print_format": "P&L Statement Standard", - "disable_prepared_report_automation": 0, - "disabled": 0, - "docstatus": 0, - "doctype": "Report", "doctype_to_sync": [ { "doc_type": "GL Entry" } ], "filters": [], - "generate_csv": 0, - "idx": 2, - "is_standard": "Yes", - "modified": "2026-06-22 13:38:15.898375", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Profit and Loss Statement", - "owner": "Administrator", - "prepared_report": 0, - "ref_doctype": "GL Entry", - "report_name": "Profit and Loss Statement", - "report_type": "Script Report", ->>>>>>> 6a93baacf0 (feat(profit-and-loss): implement execute_synced_report with full parity to normal report) "roles": [ { "role": "Accounts User" @@ -55,12 +31,7 @@ { "role": "Auditor" } -<<<<<<< HEAD - ] -} -======= ], "synced_report": 0, "timeout": 0 } ->>>>>>> 6a93baacf0 (feat(profit-and-loss): implement execute_synced_report with full parity to normal report) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.json b/erpnext/accounts/report/trial_balance/trial_balance.json index f8511d70abe..25b565a124d 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.json +++ b/erpnext/accounts/report/trial_balance/trial_balance.json @@ -1,5 +1,4 @@ { -<<<<<<< HEAD "add_total_row": 0, "apply_user_permissions": 1, "creation": "2014-07-22 11:41:23.743564", @@ -8,41 +7,18 @@ "doctype": "Report", "idx": 2, "is_standard": "Yes", - "modified": "2017-02-24 20:12:33.520866", + "modified": "2026-06-22 13:38:42.740436", "modified_by": "Administrator", "module": "Accounts", "name": "Trial Balance", "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-22 13:38:42.740436", - "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": [ { @@ -54,12 +30,7 @@ { "role": "Auditor" } -<<<<<<< HEAD - ] -} -======= ], "synced_report": 0, "timeout": 0 } ->>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master)