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

refactor: maintain sync dependency in report master

Browse Source 
(cherry picked from commit 5c536b8ad1)

# 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
This commit is contained in:
ruthra kumar
2026-06-18 12:39:25 +05:30
committed by Mergify
parent 9b3e204e33
commit ed679396d4
4 changed files with 131 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
]
}
}
=======
],
"synced_report": 1,
"timeout": 0
}
>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master)

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

@@ -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
]
}
}
=======
],
"synced_report": 1,
"timeout": 0
}
>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master)

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

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

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

@@ -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
]
}
}
=======
],
"synced_report": 1,
"timeout": 0
}
>>>>>>> 5c536b8ad1 (refactor: maintain sync dependency in report master)