mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-04 04:39:11 +00:00
Merge pull request #55501 from frappe/mergify/bp/version-15/pr-55495
fix: opening bal double counting in Process Period Closing Voucher (backport #55495)
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"actions": [],
|
"actions": [],
|
||||||
|
"allow_bulk_edit": 1,
|
||||||
"autoname": "format:Process-PCV-{###}",
|
"autoname": "format:Process-PCV-{###}",
|
||||||
"creation": "2025-09-25 15:44:03.534699",
|
"creation": "2025-09-25 15:44:03.534699",
|
||||||
"doctype": "DocType",
|
"doctype": "DocType",
|
||||||
@@ -7,11 +8,13 @@
|
|||||||
"field_order": [
|
"field_order": [
|
||||||
"parent_pcv",
|
"parent_pcv",
|
||||||
"status",
|
"status",
|
||||||
|
"amended_from",
|
||||||
|
"section_normal_balances",
|
||||||
"p_l_closing_balance",
|
"p_l_closing_balance",
|
||||||
"normal_balances",
|
|
||||||
"bs_closing_balance",
|
"bs_closing_balance",
|
||||||
"z_opening_balances",
|
"normal_balances",
|
||||||
"amended_from"
|
"section_opening_balances",
|
||||||
|
"z_opening_balances"
|
||||||
],
|
],
|
||||||
"fields": [
|
"fields": [
|
||||||
{
|
{
|
||||||
@@ -64,17 +67,27 @@
|
|||||||
"fieldname": "bs_closing_balance",
|
"fieldname": "bs_closing_balance",
|
||||||
"fieldtype": "JSON",
|
"fieldtype": "JSON",
|
||||||
"label": "Balance Sheet Closing Balance"
|
"label": "Balance Sheet Closing Balance"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_normal_balances",
|
||||||
|
"fieldtype": "Tab Break",
|
||||||
|
"label": "Normal Balances"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "section_opening_balances",
|
||||||
|
"fieldtype": "Tab Break",
|
||||||
|
"label": "Opening Balances"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"grid_page_length": 50,
|
"grid_page_length": 50,
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2025-11-05 11:40:24.996403",
|
"modified": "2026-06-01 12:16:37.374412",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Accounts",
|
"module": "Accounts",
|
||||||
"name": "Process Period Closing Voucher",
|
"name": "Process Period Closing Voucher",
|
||||||
"naming_rule": "Expression",
|
"naming_rule": "Expression (old style)",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -559,6 +559,9 @@ def process_individual_date(docname: str, date, report_type, parentfield):
|
|||||||
|
|
||||||
if parentfield == "z_opening_balances":
|
if parentfield == "z_opening_balances":
|
||||||
query = query.where(gle.is_opening.eq("Yes"))
|
query = query.where(gle.is_opening.eq("Yes"))
|
||||||
|
else:
|
||||||
|
# Keep balances aligned with legacy PCV logic (non-opening transactions only)
|
||||||
|
query = query.where(gle.is_opening.eq("No"))
|
||||||
|
|
||||||
query = query.groupby(gle.account)
|
query = query.groupby(gle.account)
|
||||||
for dim in dimensions:
|
for dim in dimensions:
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||||
|
// License: GNU General Public License v3. See license.txt
|
||||||
|
|
||||||
|
// render
|
||||||
|
frappe.listview_settings["Process Period Closing Voucher"] = {
|
||||||
|
add_fields: ["status"],
|
||||||
|
get_indicator: function (doc) {
|
||||||
|
const status_colors = {
|
||||||
|
Queued: "blue",
|
||||||
|
Running: "orange",
|
||||||
|
Paused: "gray",
|
||||||
|
Completed: "green",
|
||||||
|
Cancelled: "red",
|
||||||
|
};
|
||||||
|
return [__(doc.status), status_colors[doc.status], "status,=," + doc.status];
|
||||||
|
},
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user