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

refactor: cr and dr note filter in Statement of Accounts

Browse Source 
(cherry picked from commit 0cf478c4c2)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
This commit is contained in:
ruthra kumar
2024-08-13 10:41:31 +05:30
committed by Mergify
parent 774db56762
commit 19dfeca96d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
View File

@@ -16,6 +16,7 @@
"cost_center", "cost_center",
"territory", "territory",
"ignore_exchange_rate_revaluation_journals", "ignore_exchange_rate_revaluation_journals",
"ignore_cr_dr_notes",
"column_break_14", "column_break_14",
"to_date", "to_date",
"finance_book", "finance_book",
@@ -383,10 +384,20 @@
"fieldname": "ignore_exchange_rate_revaluation_journals", "fieldname": "ignore_exchange_rate_revaluation_journals",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Ignore Exchange Rate Revaluation Journals" "label": "Ignore Exchange Rate Revaluation Journals"
},
{
"default": "0",
"fieldname": "ignore_cr_dr_notes",
"fieldtype": "Check",
"label": "Ignore System Generated Credit / Debit Notes"
} }
], ],
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-12-18 12:20:08.965120", "modified": "2023-12-18 12:20:08.965120",
=======
"modified": "2024-08-13 10:41:18.381165",
>>>>>>> 0cf478c4c2 (refactor: cr and dr note filter in Statement of Accounts)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Statement Of Accounts", "name": "Process Statement Of Accounts",

1
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@@ -54,6 +54,7 @@ class ProcessStatementOfAccounts(Document):
frequency: DF.Literal["Weekly", "Monthly", "Quarterly"] frequency: DF.Literal["Weekly", "Monthly", "Quarterly"]
from_date: DF.Date | None from_date: DF.Date | None
group_by: DF.Literal["", "Group by Voucher", "Group by Voucher (Consolidated)"] group_by: DF.Literal["", "Group by Voucher", "Group by Voucher (Consolidated)"]
ignore_cr_dr_notes: DF.Check
ignore_exchange_rate_revaluation_journals: DF.Check ignore_exchange_rate_revaluation_journals: DF.Check
include_ageing: DF.Check include_ageing: DF.Check
include_break: DF.Check include_break: DF.Check