修正

backend/app/modules/trial_balance/sql.py

@@ -17,9 +17,10 @@ opening AS (
         SUM(jl.debit)  AS opening_debit,
         SUM(jl.credit) AS opening_credit
     FROM journal_entries je
-    JOIN journal_lines jl ON jl.journal_id = je.journal_id
+    JOIN journal_lines jl ON jl.journal_entry_id = je.journal_entry_id
     WHERE je.description = '前期残高'
-      AND je.journal_date = %(start_date)s
+      AND je.entry_date = %(start_date)s
+      AND je.is_deleted = false
     GROUP BY jl.account_id
 ),
 
@@ -29,9 +30,15 @@ period AS (
         SUM(jl.debit)  AS period_debit,
         SUM(jl.credit) AS period_credit
     FROM journal_entries je
-    JOIN journal_lines jl ON jl.journal_id = je.journal_id
-    WHERE je.journal_date BETWEEN %(start_date)s AND %(end_date)s
+    JOIN journal_lines jl ON jl.journal_entry_id = je.journal_entry_id
+    LEFT JOIN journal_entries child ON child.parent_entry_id = je.journal_entry_id
+    WHERE je.entry_date BETWEEN %(start_date)s AND %(end_date)s
       AND je.description <> '前期残高'
+      AND je.is_deleted = false
+      -- 逆仕訳を除外（[逆仕訳]プレフィックスを持つ仕訳）
+      AND je.description NOT LIKE '[逆仕訳]%'
+      -- 子仕訳（修正後仕訳）を持つ修正前の仕訳を除外
+      AND child.journal_entry_id IS NULL
     GROUP BY jl.account_id
 )