nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 15:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: synced reports should be enabled on sites based on requirements

Browse Source 
(cherry picked from commit 963bbc8729)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.json
This commit is contained in:
ruthra kumar
2026-06-22 13:39:01 +05:30
committed by Mergify
parent 7b7c4bd3b3
commit 363519a7cb
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/accounts_payable/accounts_payable.json
View File

@@ -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)

4
erpnext/accounts/report/accounts_receivable/accounts_receivable.json
View File

@@ -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)

4
erpnext/accounts/report/balance_sheet/balance_sheet.json
View File

@@ -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)

6
erpnext/accounts/report/general_ledger/general_ledger.json
View File

@@ -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
}

4
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json
View File

@@ -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)

4
erpnext/accounts/report/trial_balance/trial_balance.json
View File

@@ -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)