mdsfred/cashbook
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

line: omit calculation of balance if credit/debit = None

Browse source 
remove unused imports
This commit is contained in:
Frederik Jaeckel 2023-01-15 11:03:50 +01:00
parent a9773a42df
commit 11d6183d65
8 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
line.py
View file

@ -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

1
view/line_list.xml
View file

@ -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>

3
wizard_booking.py
View file

@ -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

2
wizard_booking.xml
View file

@ -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>

2
wizard_openline.py
View file

@ -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.

2
wizard_openline.xml
View file

@ -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>

5
wizard_runreport.py
View file

@ -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

2
wizard_runreport.xml
View file

@ -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>