From 363519a7cb935b9fe47ba3ac6473ebf93f5a49ed Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 22 Jun 2026 13:39:01 +0530 Subject: [PATCH] refactor: synced reports should be enabled on sites based on requirements (cherry picked from commit 963bbc8729e279c91582b942f43aaad645c872b1) # Conflicts: # erpnext/accounts/report/general_ledger/general_ledger.json --- .../accounts/report/accounts_payable/accounts_payable.json | 4 ++-- .../report/accounts_receivable/accounts_receivable.json | 4 ++-- erpnext/accounts/report/balance_sheet/balance_sheet.json | 4 ++-- erpnext/accounts/report/general_ledger/general_ledger.json | 6 +++++- .../profit_and_loss_statement.json | 4 ++-- erpnext/accounts/report/trial_balance/trial_balance.json | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.json b/erpnext/accounts/report/accounts_payable/accounts_payable.json index e5d4e4206c1..a2b5c8b7f14 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.json +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.json @@ -35,7 +35,7 @@ "generate_csv": 0, "idx": 3, "is_standard": "Yes", - "modified": "2026-06-18 11:54:12.154865", + "modified": "2026-06-25 12:03:36.559152", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Payable", @@ -63,7 +63,7 @@ } ======= ], - "synced_report": 1, + "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 b003e237ae2..ff2c4256c2b 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.json +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.json @@ -35,7 +35,7 @@ "generate_csv": 0, "idx": 5, "is_standard": "Yes", - "modified": "2026-06-18 11:53:59.190645", + "modified": "2026-06-25 12:03:28.812092", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Receivable", @@ -57,7 +57,7 @@ } ======= ], - "synced_report": 1, + "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 19a36d35a5e..81c42f87df2 100644 --- a/erpnext/accounts/report/balance_sheet/balance_sheet.json +++ b/erpnext/accounts/report/balance_sheet/balance_sheet.json @@ -35,7 +35,7 @@ "generate_csv": 0, "idx": 3, "is_standard": "Yes", - "modified": "2026-06-22 13:06:12.602924", + "modified": "2026-06-22 13:38:25.236839", "modified_by": "Administrator", "module": "Accounts", "name": "Balance Sheet", @@ -60,7 +60,7 @@ } ======= ], - "synced_report": 1, + "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 4bb2c24c7e0..7ccc0db2fbd 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.json +++ b/erpnext/accounts/report/general_ledger/general_ledger.json @@ -26,12 +26,16 @@ "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", @@ -51,6 +55,6 @@ "role": "Auditor" } ], - "synced_report": 1, + "synced_report": 0, "timeout": 0 } 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 b14131028a9..e0f2892ac31 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 @@ -35,7 +35,7 @@ "generate_csv": 0, "idx": 2, "is_standard": "Yes", - "modified": "2026-06-22 13:06:12.602924", + "modified": "2026-06-22 13:38:15.898375", "modified_by": "Administrator", "module": "Accounts", "name": "Profit and Loss Statement", @@ -60,7 +60,7 @@ } ======= ], - "synced_report": 1, + "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 035f112cb0f..f8511d70abe 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.json +++ b/erpnext/accounts/report/trial_balance/trial_balance.json @@ -34,7 +34,7 @@ "generate_csv": 0, "idx": 4, "is_standard": "Yes", - "modified": "2026-06-18 16:37:42.112788", + "modified": "2026-06-22 13:38:42.740436", "modified_by": "Administrator", "module": "Accounts", "name": "Trial Balance", @@ -59,7 +59,7 @@ } ======= ], - "synced_report": 1, + "synced_report": 0, "timeout": 0 } >>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master)