feat: add opening balance

alyf-de · Dec 29, 2023 · 2d35592 · 2d35592
1 parent 2d01a6a
commit 2d35592
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/erpnext_germany/erpnext_germany/report/summen__und_saldenliste/summen__und_saldenliste.py b/erpnext_germany/erpnext_germany/report/summen__und_saldenliste/summen__und_saldenliste.py
@@ -8,6 +8,7 @@
 import frappe
 from frappe import _
 from frappe.query_builder.functions import Sum, Cast
+from pypika.terms import Case
 
 
 def execute(filters=None):
@@ -38,6 +39,20 @@ def get_columns(current_month_name: str):
 			"options": "Currency",
 			"width": 100,
 		},
+		{
+			"fieldname": "debit_opening_balance",
+			"label": _("Debit Opening Balance"),
+			"fieldtype": "Currency",
+			"width": 170,
+			"options": "account_currency",
+		},
+		{
+			"fieldname": "credit_opening_balance",
+			"label": _("Credit Opening Balance"),
+			"fieldtype": "Currency",
+			"width": 170,
+			"options": "account_currency",
+		},
 		{
 			"fieldname": "debit_until_evaluation_period",
 			"label": _("Debit until {0}").format(current_month_name),
@@ -73,6 +88,37 @@ def get_data(company: str, fy_start, month_start, month_end):
 	gl_entry = frappe.qb.DocType("GL Entry")
 	account = frappe.qb.DocType("Account")
 
+	opening_balance = (
+		frappe.qb.from_(gl_entry)
+		.left_join(account)
+		.on(gl_entry.account == account.name)
+		.select(
+			gl_entry.account,
+			Case()
+			.when(
+				account.root_type == "Asset",
+				Sum(gl_entry.debit_in_account_currency)
+				- Sum(gl_entry.credit_in_account_currency),
+			)
+			.else_(None)
+			.as_("debit"),
+			Case()
+			.when(
+				account.root_type.isin(("Liability", "Equity")),
+				Sum(gl_entry.credit_in_account_currency)
+				- Sum(gl_entry.debit_in_account_currency),
+			)
+			.else_(None)
+			.as_("credit"),
+		)
+		.where(
+			(gl_entry.company == company)
+			& (gl_entry.is_cancelled == 0)
+			& (gl_entry.posting_date < fy_start)
+		)
+		.groupby(gl_entry.account)
+	)
+
 	sum_until_month = (
 		frappe.qb.from_(gl_entry)
 		.select(
@@ -115,9 +161,13 @@ def get_data(company: str, fy_start, month_start, month_end):
 		frappe.qb.from_(sum_in_month)
 		.left_join(sum_until_month)
 		.on(sum_until_month.account == sum_in_month.account)
+		.left_join(opening_balance)
+		.on(opening_balance.account == sum_in_month.account)
 		.select(
 			sum_in_month.account,
 			sum_in_month.account_currency,
+			opening_balance.debit,
+			opening_balance.credit,
 			sum_until_month.debit,
 			sum_until_month.credit,
 			sum_in_month.debit,

diff --git a/erpnext_germany/translations/de.csv b/erpnext_germany/translations/de.csv
@@ -47,3 +47,5 @@ Debit until {0},Soll bis {0},
 Credit until {0},Haben bis {0},
 Debit in {0},Soll im {0},
 Credit in {0},Haben im {0},
+Debit Opening Balance,Soll Anfangsbestand,
+Credit Opening Balance,Haben Anfangsbestand,