nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: provision to set remarks length in accounts settings

Browse Source 
(cherry picked from commit 97090ff367)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
This commit is contained in:
ruthra kumar
2023-11-18 09:04:36 +05:30
committed by Mergify
parent 5afb8b59c9
commit 4e2d0aa892
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -67,8 +67,16 @@
"banking_tab",
"enable_party_matching",
"enable_fuzzy_matching",
<<<<<<< HEAD
"tab_break_dpet",
"show_balance_in_coa"
=======
"reports_tab",
"remarks_section",
"general_ledger_remarks_length",
"column_break_lvjk",
"receivable_payable_remarks_length"
>>>>>>> 97090ff367 (refactor: provision to set `remarks` length in accounts settings)
],
"fields": [
{
@@ -428,7 +436,39 @@
"default": "1",
"fieldname": "show_balance_in_coa",
"fieldtype": "Check",
<<<<<<< HEAD
"label": "Show Balances in Chart Of Accounts"
=======
"label": "Round Tax Amount Row-wise"
},
{
"fieldname": "reports_tab",
"fieldtype": "Tab Break",
"label": "Reports"
},
{
"default": "0",
"description": "Truncates 'Remarks' column to set character length",
"fieldname": "general_ledger_remarks_length",
"fieldtype": "Int",
"label": "General Ledger"
},
{
"default": "0",
"description": "Truncates 'Remarks' column to set character length",
"fieldname": "receivable_payable_remarks_length",
"fieldtype": "Int",
"label": "Accounts Receivable/Payable"
},
{
"fieldname": "column_break_lvjk",
"fieldtype": "Column Break"
},
{
"fieldname": "remarks_section",
"fieldtype": "Section Break",
"label": "Remarks Column Length"
>>>>>>> 97090ff367 (refactor: provision to set `remarks` length in accounts settings)
}
],
"icon": "icon-cog",
@@ -436,7 +476,11 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-07-27 15:05:34.000264",
=======
"modified": "2023-11-20 09:37:47.650347",
>>>>>>> 97090ff367 (refactor: provision to set `remarks` length in accounts settings)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts Settings",

7
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -164,7 +164,12 @@ def get_gl_entries(filters, accounting_dimensions):
credit_in_account_currency """
if filters.get("show_remarks"):
select_fields += """,remarks"""
if remarks_length := frappe.db.get_single_value(
"Accounts Settings", "general_ledger_remarks_length"
):
select_fields += f",substr(remarks, 1, {remarks_length}) as 'remarks'"
else:
select_fields += """,remarks"""
order_by_statement = "order by posting_date, account, creation"