From 5a3752189cb9cde2af9ffcababe38269a8823932 Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Sun, 20 Apr 2025 21:49:58 +0200 Subject: [PATCH 01/12] feat: more restricted fields added to accounting domain --- erpnext/domains/accounting.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index 142ea86d64..79efb9eb96 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -7,6 +7,9 @@ restricted_fields: - expense_account - default_provisional_account - income_account + - deferred_accounting_defaults_section + Item Tax: + - income_expense_section Sales Invoice: - debit_to - accounting_journal @@ -15,6 +18,36 @@ restricted_fields: - income_account - expense_account - enable_deferred_revenue + Delivery Note Item: + - expense_account + Purchase Order Item: + - accounting_details + Purchase Receipt Item: + - accounting_details + Purchase Invoice: + - accounting_details_section + Purchase Invoice Item: + - accounting + - deferred_expense_account + +disabled_properties: + - doctype: "Sales Invoice Item" + fieldname: "income_account" + property: "default" + value: frappe.get_value("Company", frappe.db.get_single_value("Global Defaults", "default_company"), "default_income_account") + - doctype: "Item" + fieldname: "accounting" + property: "label" + value: "Default Values" + - doctype: "Item" + fieldname: "default_values_section" + property: "label" + value: "" + - doctype: "Delivery Note Item" + fieldname: "accounting_details_section" + property: "label" + value: "" + domain: title: Accounting -- GitLab From 27920823b68a1dad0b49c7232e9c3a78dcb163ad Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Tue, 6 May 2025 10:58:34 +0200 Subject: [PATCH 02/12] resolve conflict for rebase --- erpnext/accounts/doctype/account/account.json | 6 ++++-- .../account_closing_balance.json | 4 +++- .../accounting_journal/accounting_journal.json | 4 +++- .../accounting_period/accounting_period.json | 4 +++- .../accounts_settings/accounts_settings.json | 1 + .../advance_payment_ledger_entry.json | 4 +++- .../applicable_on_account.json | 4 +++- .../journal_entry_template.json | 4 +++- .../journal_entry_template_account.json | 4 +++- .../doctype/ledger_health/ledger_health.json | 4 +++- .../ledger_health_monitor.json | 4 +++- .../ledger_health_monitor_company.json | 4 +++- .../ledger_merge_accounts.json | 4 +++- .../payment_gateway_account.json | 13 ++++++++----- .../payment_ledger_entry/payment_ledger_entry.json | 4 +++- .../process_deferred_accounting.json | 4 +++- .../process_statement_of_accounts.json | 1 + .../process_statement_of_accounts_cc.json | 4 +++- .../process_statement_of_accounts_customer.json | 4 +++- .../repost_accounting_ledger_items.json | 4 +++- .../repost_accounting_ledger_settings.json | 4 +++- .../repost_payment_ledger.json | 4 +++- .../repost_payment_ledger_items.json | 4 +++- .../south_africa_vat_account.json | 4 +++- .../suspense_vat_accounts.json | 7 +++++-- 25 files changed, 79 insertions(+), 29 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json index 10592fbb60..d579439e15 100644 --- a/erpnext/accounts/doctype/account/account.json +++ b/erpnext/accounts/doctype/account/account.json @@ -204,7 +204,7 @@ "index_web_pages_for_search": 1, "is_tree": 1, "links": [], - "modified": "2025-01-22 10:40:35.766017", + "modified": "2025-04-20 22:15:06.232948", "modified_by": "Administrator", "module": "Accounts", "name": "Account", @@ -264,12 +264,14 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "search_fields": "account_number", "show_name_in_global_search": 1, "show_preview_popup": 1, "sort_field": "creation", "sort_order": "ASC", - "title_field": "title", "states": [], + "title_field": "title", "track_changes": 1 } diff --git a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json index 95317d068b..ae20575f5f 100644 --- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json +++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json @@ -129,7 +129,7 @@ "icon": "fa fa-list", "in_create": 1, "links": [], - "modified": "2024-03-27 13:05:56.710541", + "modified": "2025-04-20 22:06:55.088666", "modified_by": "Administrator", "module": "Accounts", "name": "Account Closing Balance", @@ -158,6 +158,8 @@ "role": "Auditor" } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/accounting_journal/accounting_journal.json b/erpnext/accounts/doctype/accounting_journal/accounting_journal.json index 9fcaedc608..c19cb28ff0 100644 --- a/erpnext/accounts/doctype/accounting_journal/accounting_journal.json +++ b/erpnext/accounts/doctype/accounting_journal/accounting_journal.json @@ -76,7 +76,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-05-03 14:52:20.933209", + "modified": "2025-04-20 22:13:57.485669", "modified_by": "Administrator", "module": "Accounts", "name": "Accounting Journal", @@ -114,6 +114,8 @@ "select": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "show_title_field_in_link": 1, "sort_field": "modified", "sort_order": "DESC", diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.json b/erpnext/accounts/doctype/accounting_period/accounting_period.json index b7f50cafdb..53af29dedb 100644 --- a/erpnext/accounts/doctype/accounting_period/accounting_period.json +++ b/erpnext/accounts/doctype/accounting_period/accounting_period.json @@ -62,7 +62,7 @@ } ], "links": [], - "modified": "2024-03-27 13:05:57.388109", + "modified": "2025-04-20 22:14:44.867974", "modified_by": "Administrator", "module": "Accounts", "name": "Accounting Period", @@ -105,6 +105,8 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 19ffc574f7..f911a35a17 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -632,6 +632,7 @@ } ], "quick_entry": 1, + "restrict_to_domain": "Accounting", "row_format": "Dynamic", "sort_field": "creation", "sort_order": "ASC", diff --git a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json index 26154ed1d9..d8a447c22c 100644 --- a/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json +++ b/erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json @@ -73,7 +73,7 @@ "in_create": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2024-11-05 10:31:28.736671", + "modified": "2025-04-20 21:52:58.862819", "modified_by": "Administrator", "module": "Accounts", "name": "Advance Payment Ledger Entry", @@ -107,6 +107,8 @@ "share": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json b/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json index ddf1bedb44..06f015e8fb 100644 --- a/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json +++ b/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json @@ -29,13 +29,15 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:05:59.168897", + "modified": "2025-04-20 22:09:11.526470", "modified_by": "Administrator", "module": "Accounts", "name": "Applicable On Account", "owner": "Administrator", "permissions": [], "quick_entry": 1, + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json index 35d959c286..ddc8486854 100644 --- a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json +++ b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json @@ -99,7 +99,7 @@ "link_fieldname": "from_template" } ], - "modified": "2025-02-14 08:52:34.082951", + "modified": "2025-04-20 22:16:38.143085", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry Template", @@ -140,6 +140,8 @@ "share": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "search_fields": "voucher_type, company", "sort_field": "creation", "sort_order": "DESC", diff --git a/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json b/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json index f18eb1c640..541ae5af8c 100644 --- a/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json +++ b/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json @@ -51,12 +51,14 @@ ], "istable": 1, "links": [], - "modified": "2025-02-14 08:49:59.420298", + "modified": "2025-04-20 22:10:11.714407", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry Template Account", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/ledger_health/ledger_health.json b/erpnext/accounts/doctype/ledger_health/ledger_health.json index 8f60e3abd1..fa82b5a3c0 100644 --- a/erpnext/accounts/doctype/ledger_health/ledger_health.json +++ b/erpnext/accounts/doctype/ledger_health/ledger_health.json @@ -43,7 +43,7 @@ "in_create": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2024-04-09 11:16:07.044484", + "modified": "2025-04-20 21:55:12.275048", "modified_by": "Administrator", "module": "Accounts", "name": "Ledger Health", @@ -64,6 +64,8 @@ } ], "read_only": 1, + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "modified", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json index 43ff4bb112..4556b725eb 100644 --- a/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json +++ b/erpnext/accounts/doctype/ledger_health_monitor/ledger_health_monitor.json @@ -60,7 +60,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-03-27 10:14:16.511681", + "modified": "2025-04-20 21:55:12.067549", "modified_by": "Administrator", "module": "Accounts", "name": "Ledger Health Monitor", @@ -97,6 +97,8 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "modified", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json b/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json index ab0a636bad..e8c6a18099 100644 --- a/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json +++ b/erpnext/accounts/doctype/ledger_health_monitor_company/ledger_health_monitor_company.json @@ -20,12 +20,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 10:06:22.806155", + "modified": "2025-04-20 21:55:11.759918", "modified_by": "Administrator", "module": "Accounts", "name": "Ledger Health Monitor Company", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "modified", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json b/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json index a11966b6e6..ff3ead003b 100644 --- a/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json +++ b/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json @@ -41,12 +41,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:02.352067", + "modified": "2025-04-20 21:58:25.494188", "modified_by": "Administrator", "module": "Accounts", "name": "Ledger Merge Accounts", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json index f666c60bb3..1b3e0d4ba8 100644 --- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json +++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2015-12-23 21:31:52.699821", "doctype": "DocType", "editable_grid": 1, @@ -57,15 +58,15 @@ "default": "Please click on the link below to make your payment", "fieldname": "message", "fieldtype": "Small Text", - "label": "Default Payment Request Message", - "hidden": 1 + "hidden": 1, + "label": "Default Payment Request Message" }, { "fieldname": "message_examples", "fieldtype": "HTML", + "hidden": 1, "label": "Message Examples", - "options": "
Message Example
\n\n<p> Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.</p>\n\n<p> Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.</p>\n\n<p> We don't want you to be spending time running around in order to pay for your Bill.
After all, life is beautiful and the time you have in hand should be spent to enjoy it!
So here are our little ways to help you get more time for life! </p>\n\n<a href=\"{{ payment_url }}\"> click here to pay </a>\n\n
\n", - "hidden": 1 + "options": "
Message Example
\n\n<p> Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.</p>\n\n<p> Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.</p>\n\n<p> We don't want you to be spending time running around in order to pay for your Bill.
After all, life is beautiful and the time you have in hand should be spent to enjoy it!
So here are our little ways to help you get more time for life! </p>\n\n<a href=\"{{ payment_url }}\"> click here to pay </a>\n\n
\n" }, { "default": "Email", @@ -77,7 +78,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-07-23 18:53:09.836254", + "modified": "2025-04-20 22:14:52.104516", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Gateway Account", @@ -96,6 +97,8 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json index 3d26154d82..0351ff36bb 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json +++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json @@ -166,7 +166,7 @@ "in_create": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-27 13:10:09.967095", + "modified": "2025-04-20 21:58:25.199014", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Ledger Entry", @@ -200,6 +200,8 @@ "share": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "search_fields": "voucher_no, against_voucher_no", "sort_field": "creation", "sort_order": "DESC", diff --git a/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json b/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json index bbf1d63b55..bdc5fb2ecc 100644 --- a/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json +++ b/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json @@ -76,7 +76,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:18.458661", + "modified": "2025-04-20 22:10:11.903073", "modified_by": "Administrator", "module": "Accounts", "name": "Process Deferred Accounting", @@ -124,6 +124,8 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json index 5b4f75c25f..7af16be02f 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json @@ -432,6 +432,7 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", diff --git a/erpnext/accounts/doctype/process_statement_of_accounts_cc/process_statement_of_accounts_cc.json b/erpnext/accounts/doctype/process_statement_of_accounts_cc/process_statement_of_accounts_cc.json index bc5e9668d2..5df1fc6e14 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts_cc/process_statement_of_accounts_cc.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts_cc/process_statement_of_accounts_cc.json @@ -20,12 +20,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-12-11 12:10:39.772598", + "modified": "2025-04-20 22:06:54.950928", "modified_by": "Administrator", "module": "Accounts", "name": "Process Statement Of Accounts CC", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json index 05b9b8126a..adb7a92031 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json +++ b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json @@ -41,13 +41,15 @@ ], "istable": 1, "links": [], - "modified": "2024-03-27 13:10:19.335889", + "modified": "2025-04-20 22:07:34.757746", "modified_by": "Administrator", "module": "Accounts", "name": "Process Statement Of Accounts Customer", "owner": "Administrator", "permissions": [], "quick_entry": 1, + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json b/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json index e2bbb2cc29..02ffa1c000 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json +++ b/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json @@ -28,12 +28,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:32.170897", + "modified": "2025-04-20 21:56:20.819679", "modified_by": "Administrator", "module": "Accounts", "name": "Repost Accounting Ledger Items", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json index e27b823e3a..593ae6c43e 100644 --- a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json +++ b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json @@ -17,7 +17,7 @@ "in_create": 1, "issingle": 1, "links": [], - "modified": "2024-06-06 13:56:37.908879", + "modified": "2025-04-20 21:55:12.481439", "modified_by": "Administrator", "module": "Accounts", "name": "Repost Accounting Ledger Settings", @@ -43,6 +43,8 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json index 09b6798525..c3d9e4d861 100644 --- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json +++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json @@ -98,7 +98,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-06-03 17:31:04.472279", + "modified": "2025-04-20 21:58:24.939528", "modified_by": "Administrator", "module": "Accounts", "name": "Repost Payment Ledger", @@ -156,6 +156,8 @@ "write": 1 } ], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json b/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json index 20eea80b0d..82f90073f6 100644 --- a/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json +++ b/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json @@ -23,12 +23,14 @@ ], "istable": 1, "links": [], - "modified": "2024-03-27 13:10:32.915489", + "modified": "2025-04-20 21:58:24.760275", "modified_by": "Administrator", "module": "Accounts", "name": "Repost Payment Ledger Items", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] diff --git a/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json b/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json index f52b743958..72756ef47b 100644 --- a/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json +++ b/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json @@ -22,12 +22,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:43.141409", + "modified": "2025-04-20 22:09:11.338919", "modified_by": "Administrator", "module": "Accounts", "name": "South Africa VAT Account", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/accounts/doctype/suspense_vat_accounts/suspense_vat_accounts.json b/erpnext/accounts/doctype/suspense_vat_accounts/suspense_vat_accounts.json index e7b3ebddab..e4a695304d 100644 --- a/erpnext/accounts/doctype/suspense_vat_accounts/suspense_vat_accounts.json +++ b/erpnext/accounts/doctype/suspense_vat_accounts/suspense_vat_accounts.json @@ -8,7 +8,8 @@ "field_order": [ "vat_suspense_account", "vat_control_account", - "tax_rate" + "tax_rate", + "account_doctype" ], "fields": [ { @@ -46,12 +47,14 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-04-04 17:12:45.912245", + "modified": "2025-04-20 22:06:54.708343", "modified_by": "Administrator", "module": "Accounts", "name": "Suspense VAT Accounts", "owner": "Administrator", "permissions": [], + "restrict_to_domain": "Accounting", + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [] -- GitLab From 084b83c8f2d9ae94a54e5340de2a762a7de86adc Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Sun, 20 Apr 2025 22:36:24 +0200 Subject: [PATCH 03/12] feat: workspace accounting restricted to domain accounting --- erpnext/accounts/workspace/accounting/accounting.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/workspace/accounting/accounting.json b/erpnext/accounts/workspace/accounting/accounting.json index 7cebb98a4b..91ccf27664 100644 --- a/erpnext/accounts/workspace/accounting/accounting.json +++ b/erpnext/accounts/workspace/accounting/accounting.json @@ -733,7 +733,7 @@ "type": "Link" } ], - "modified": "2023-10-19 09:33:32.606327", + "modified": "2025-04-20 22:29:52.711657", "modified_by": "Administrator", "module": "Accounts", "name": "Accounting", @@ -742,6 +742,7 @@ "parent_page": "Finance", "public": 1, "quick_lists": [], + "restrict_to_domain": "Accounting", "roles": [], "sequence_id": 3.0, "shortcuts": [ -- GitLab From effeb236666505aaa23da625ff7ebbcbbb17e77c Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Mon, 28 Apr 2025 16:52:28 +0200 Subject: [PATCH 04/12] feat: restricted roles added to Accouting domain --- erpnext/domains/accounting.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index 79efb9eb96..afdb225bc7 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -47,6 +47,10 @@ disabled_properties: fieldname: "accounting_details_section" property: "label" value: "" + +restricted_roles: + - Accounts Manager + - Accounts User domain: -- GitLab From b69df336b8a0dd0d0af0528e8d6465e30d71965e Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Mon, 28 Apr 2025 17:19:35 +0200 Subject: [PATCH 05/12] feat: Company restricted fields for Accounting domain --- erpnext/domains/accounting.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index afdb225bc7..ad210d273d 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -29,6 +29,17 @@ restricted_fields: Purchase Invoice Item: - accounting - deferred_expense_account + Company: + - accounts_tab + - default_inventory_account + - stock_adjustment_account + - stock_received_but_not_billed + - default_provisional_account + - default_operating_cost_account + - default_expense_claim_payable_account + - default_employee_advance_account + - default_payroll_payable_account + disabled_properties: - doctype: "Sales Invoice Item" -- GitLab From 1b3567628a45ed86b4ddf3498c6587f7624217d6 Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Tue, 6 May 2025 11:45:48 +0200 Subject: [PATCH 06/12] fix: use sales invoice company for default income acount --- erpnext/domains/accounting.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index ad210d273d..1bd4e5906f 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -45,7 +45,7 @@ disabled_properties: - doctype: "Sales Invoice Item" fieldname: "income_account" property: "default" - value: frappe.get_value("Company", frappe.db.get_single_value("Global Defaults", "default_company"), "default_income_account") + value: frappe.get_value("Company", frappe.db.get_value("Sales Invoice", doc.parent, "company"), "default_income_account") - doctype: "Item" fieldname: "accounting" property: "label" -- GitLab From a66bb47fce22e654fdfb0f7532a3b7bc6806d3f1 Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Tue, 6 May 2025 16:00:45 +0200 Subject: [PATCH 07/12] feat: give sales invoice permissions to sales user and sales manager --- erpnext/domains/accounting.yaml | 36 +++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index 1bd4e5906f..c1b15298b2 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -61,8 +61,40 @@ disabled_properties: restricted_roles: - Accounts Manager - - Accounts User - + - Accounts User + +disabled_perm: + - parent: "Sales Invoice" + role: "Sales User" + read: 1 + write: 1 + create: 1 + submit: 1 + amend: 1 + print: 1 + email: 1 + report: 1 + share: 1 + + - parent: "Sales Invoice" + role: "Sales Manager" + read: 1 + write: 1 + create: 1 + delete: 1 + submit: 1 + cancel: 1 + amend: 1 + print: 1 + email: 1 + report: 1 + share: 1 + + - parent: "Sales Invoice" + role: "Sales Manager" + read: 1 + write: 1 + permlevel: 1 domain: title: Accounting -- GitLab From 4ffb81a279902f97b279154e4217db8c2425da7b Mon Sep 17 00:00:00 2001 From: Antoine Maas Date: Wed, 14 May 2025 16:39:29 +0200 Subject: [PATCH 08/12] fix: removed restricted roles and perm modifications --- erpnext/domains/accounting.yaml | 37 --------------------------------- 1 file changed, 37 deletions(-) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index c1b15298b2..5cf045bfee 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -59,43 +59,6 @@ disabled_properties: property: "label" value: "" -restricted_roles: - - Accounts Manager - - Accounts User - -disabled_perm: - - parent: "Sales Invoice" - role: "Sales User" - read: 1 - write: 1 - create: 1 - submit: 1 - amend: 1 - print: 1 - email: 1 - report: 1 - share: 1 - - - parent: "Sales Invoice" - role: "Sales Manager" - read: 1 - write: 1 - create: 1 - delete: 1 - submit: 1 - cancel: 1 - amend: 1 - print: 1 - email: 1 - report: 1 - share: 1 - - - parent: "Sales Invoice" - role: "Sales Manager" - read: 1 - write: 1 - permlevel: 1 - domain: title: Accounting description: Hide or show accounting fields in sales and purchase transactions \ No newline at end of file -- GitLab From 3decfbc5990695d279734d0c0377d4abb043c9ce Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Sun, 25 May 2025 21:40:38 +0200 Subject: [PATCH 09/12] fix: use fake defaults to allow doctype customizations --- erpnext/domains/accounting.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index 5cf045bfee..136b814363 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -11,10 +11,12 @@ restricted_fields: Item Tax: - income_expense_section Sales Invoice: + - accounting_details_section - debit_to - accounting_journal - is_opening Sales Invoice Item: + - accounting - income_account - expense_account - enable_deferred_revenue @@ -26,8 +28,13 @@ restricted_fields: - accounting_details Purchase Invoice: - accounting_details_section + - credit_to + - accounting_journal + - is_opening Purchase Invoice Item: - accounting + - expense_account + - enable_deferred_expense - deferred_expense_account Company: - accounts_tab @@ -45,7 +52,11 @@ disabled_properties: - doctype: "Sales Invoice Item" fieldname: "income_account" property: "default" - value: frappe.get_value("Company", frappe.db.get_value("Sales Invoice", doc.parent, "company"), "default_income_account") + value: frappe.defaults.get_default("Income Account") # Returns undefined but avoids customization errors + - doctype: "Purchase Invoice Item" + fieldname: "expense_account" + property: "default" + value: frappe.defaults.get_default("Expense Account") # Returns undefined but avoids customization errors - doctype: "Item" fieldname: "accounting" property: "label" -- GitLab From 7f966774d4bcaabe25081472ae03bda475955923 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 26 May 2025 09:39:35 +0200 Subject: [PATCH 10/12] fix: Use colons to avoid default been interpreted literally --- erpnext/domains/accounting.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index 136b814363..2a604178c8 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -52,11 +52,11 @@ disabled_properties: - doctype: "Sales Invoice Item" fieldname: "income_account" property: "default" - value: frappe.defaults.get_default("Income Account") # Returns undefined but avoids customization errors + value: ":frappe.defaults.get_default('Income Account')" # Returns undefined but avoids customization errors - doctype: "Purchase Invoice Item" fieldname: "expense_account" property: "default" - value: frappe.defaults.get_default("Expense Account") # Returns undefined but avoids customization errors + value: ":frappe.defaults.get_default('Expense Account')" # Returns undefined but avoids customization errors - doctype: "Item" fieldname: "accounting" property: "label" -- GitLab From 769133baf270715407f96216076c4b8543d49338 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 26 May 2025 09:40:16 +0200 Subject: [PATCH 11/12] fix: Add colons to default value --- erpnext/domains/stocks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/domains/stocks.yaml b/erpnext/domains/stocks.yaml index 6abad4d014..c31670159b 100644 --- a/erpnext/domains/stocks.yaml +++ b/erpnext/domains/stocks.yaml @@ -110,7 +110,7 @@ disabled_properties: - doctype: "Purchase Receipt Item" fieldname: "stock_uom" property: "default" - value: "frappe.defaults.get_user_default('Stock UOM')" # Fake default to avoid customization issues + value: ":frappe.defaults.get_user_default('Stock UOM')" # Fake default to avoid customization issues modules: -- GitLab From 46e5058a4daf61285a84e30c3fcc6a70bb74b169 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Mon, 26 May 2025 11:25:54 +0200 Subject: [PATCH 12/12] fix: Add default values for credit_to and debit_to fields --- erpnext/domains/accounting.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/domains/accounting.yaml b/erpnext/domains/accounting.yaml index 2a604178c8..a64bda836d 100644 --- a/erpnext/domains/accounting.yaml +++ b/erpnext/domains/accounting.yaml @@ -69,6 +69,14 @@ disabled_properties: fieldname: "accounting_details_section" property: "label" value: "" + - doctype: "Sales Invoice" + fieldname: "debit_to" + property: "default" + value: ":frappe.defaults.get_default('Debit To Account')" # Returns undefined but avoids customization errors + - doctype: "Purchase Invoice" + fieldname: "credit_to" + property: "default" + value: ":frappe.defaults.get_default('Credit To Account')" # Returns undefined but avoids customization errors domain: title: Accounting -- GitLab