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

feat: Period-wise closing entries for TB (#39712)

Browse Source 
(cherry picked from commit 6e6c818084)

# Conflicts:
#	erpnext/accounts/report/trial_balance/trial_balance.js
This commit is contained in:
Deepesh Garg
2024-02-05 14:10:42 +05:30
committed by Mergify
parent 9fcca18bf3
commit 4b3e454fb4
2 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
erpnext/accounts/report/trial_balance/trial_balance.js
View File

@@ -24,6 +24,7 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
if (!fiscal_year) { if (!fiscal_year) {
return; return;
} }
<<<<<<< HEAD
frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) { frappe.model.with_doc("Fiscal Year", fiscal_year, function (r) {
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year); var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
frappe.query_report.set_filter_value({ frappe.query_report.set_filter_value({
@@ -113,6 +114,70 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
parent_field: "parent_account", parent_field: "parent_account",
initial_depth: 3, initial_depth: 3,
}; };
=======
}
}
},
{
"fieldname": "project",
"label": __("Project"),
"fieldtype": "Link",
"options": "Project"
},
{
"fieldname": "finance_book",
"label": __("Finance Book"),
"fieldtype": "Link",
"options": "Finance Book",
},
{
"fieldname": "presentation_currency",
"label": __("Currency"),
"fieldtype": "Select",
"options": erpnext.get_presentation_currency_list()
},
{
"fieldname": "with_period_closing_entry_for_opening",
"label": __("With Period Closing Entry For Opening Balances"),
"fieldtype": "Check",
"default": 1
},
{
"fieldname": "with_period_closing_entry_for_current_period",
"label": __("Period Closing Entry For Current Period"),
"fieldtype": "Check",
"default": 1
},
{
"fieldname": "show_zero_values",
"label": __("Show zero values"),
"fieldtype": "Check"
},
{
"fieldname": "show_unclosed_fy_pl_balances",
"label": __("Show unclosed fiscal year's P&L balances"),
"fieldtype": "Check"
},
{
"fieldname": "include_default_book_entries",
"label": __("Include Default FB Entries"),
"fieldtype": "Check",
"default": 1
},
{
"fieldname": "show_net_values",
"label": __("Show net values in opening and closing columns"),
"fieldtype": "Check",
"default": 1
}
],
"formatter": erpnext.financial_statements.formatter,
"tree": true,
"name_field": "account",
"parent_field": "parent_account",
"initial_depth": 3
}
>>>>>>> 6e6c818084 (feat: Period-wise closing entries for TB (#39712))
erpnext.utils.add_dimensions("Trial Balance", 6); erpnext.utils.add_dimensions("Trial Balance", 6);
}); });

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

@@ -120,7 +120,7 @@ def get_data(filters):
max_rgt, max_rgt,
filters, filters,
gl_entries_by_account, gl_entries_by_account,
ignore_closing_entries=not flt(filters.with_period_closing_entry), ignore_closing_entries=not flt(filters.with_period_closing_entry_for_current_period),
ignore_opening_entries=True, ignore_opening_entries=True,
) )
@@ -274,7 +274,7 @@ def get_opening_balance(
): ):
opening_balance = opening_balance.where(closing_balance.posting_date >= filters.year_start_date) opening_balance = opening_balance.where(closing_balance.posting_date >= filters.year_start_date)
if not flt(filters.with_period_closing_entry): if not flt(filters.with_period_closing_entry_for_opening):
if doctype == "Account Closing Balance": if doctype == "Account Closing Balance":
opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0) opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0)
else: else: