From 11d6183d65054c17c0e7cad54a476c0a945c41c3 Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Sun, 15 Jan 2023 11:03:50 +0100
Subject: [PATCH] line: omit calculation of balance if credit/debit = None
 remove unused imports

---
 line.py              | 7 ++++++-
 view/line_list.xml   | 1 -
 wizard_booking.py    | 3 +--
 wizard_booking.xml   | 2 +-
 wizard_openline.py   | 2 +-
 wizard_openline.xml  | 2 +-
 wizard_runreport.py  | 5 ++---
 wizard_runreport.xml | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/line.py b/line.py
index 7c877bc..3031fea 100644
--- a/line.py
+++ b/line.py
@@ -733,7 +733,12 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
 
             lines = Line2.search(query)
             for line3 in lines:
-                balance += getattr(line3, credit_name) - getattr(line3, debit_name)
+                line_credit = getattr(line3, credit_name)
+                line_debit = getattr(line3, debit_name)
+
+                if (line_credit is not None) or (line_debit is not None):
+                    balance += line_credit - line_debit
+
                 if line3.id == line.id:
                     break
             return balance
diff --git a/view/line_list.xml b/view/line_list.xml
index 9bef16b..fffc0ac 100644
--- a/view/line_list.xml
+++ b/view/line_list.xml
@@ -13,6 +13,5 @@ full copyright notices and license terms. -->
     <field name="debit" sum="Debit"/>
     <field name="balance"/>
     <field name="state"/>
-    <button name="wfedit"/>
     <button name="wfcheck"/>
 </tree>
diff --git a/wizard_booking.py b/wizard_booking.py
index 27304c9..5c58a69 100644
--- a/wizard_booking.py
+++ b/wizard_booking.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
+# This file is part of the cashbook-module from m-ds.de for Tryton.
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
 from trytond.model import ModelView, fields
 from trytond.wizard import Wizard, StateView, StateTransition, Button
-from trytond.i18n import gettext
 from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.pyson import Eval, Bool, If, And
diff --git a/wizard_booking.xml b/wizard_booking.xml
index 1a62755..8c9c0bd 100644
--- a/wizard_booking.xml
+++ b/wizard_booking.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
+<!-- This file is part of the cashbook-module from m-ds.de for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tryton>
diff --git a/wizard_openline.py b/wizard_openline.py
index c20fc6a..770c3da 100644
--- a/wizard_openline.py
+++ b/wizard_openline.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
+# This file is part of the cashbook-module from m-ds.de for Tryton.
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
diff --git a/wizard_openline.xml b/wizard_openline.xml
index 7894e2e..760ad94 100644
--- a/wizard_openline.xml
+++ b/wizard_openline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
+<!-- This file is part of the cashbook-module from m-ds.de for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tryton>
diff --git a/wizard_runreport.py b/wizard_runreport.py
index 97a1ea8..b864e1f 100644
--- a/wizard_runreport.py
+++ b/wizard_runreport.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
-# This file is part of the cashbook-module from m-ds for Tryton.
+# This file is part of the cashbook-module from m-ds.de for Tryton.
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
 from trytond.model import ModelView, fields
 from trytond.pyson import PYSONEncoder
-from trytond.wizard import Wizard, StateView, StateTransition, StateReport, Button
-from trytond.i18n import gettext
+from trytond.wizard import Wizard, StateView, StateReport, Button
 from trytond.pool import Pool
 from trytond.pyson import Eval, Bool
 from trytond.transaction import Transaction
diff --git a/wizard_runreport.xml b/wizard_runreport.xml
index e2a21ab..e7158e0 100644
--- a/wizard_runreport.xml
+++ b/wizard_runreport.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- This file is part of the cashbook-module from m-ds for Tryton.
+<!-- This file is part of the cashbook-module from m-ds.de for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tryton>