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

line: fix write() - dont rewrite values if not given

Browse source
This commit is contained in:
Frederik Jaeckel 2023-02-05 11:34:18 +01:00
parent 9d33086ff2
commit f105e8bd6c
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
line.py
View file

@ -815,10 +815,10 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
""" compute debit/credit from amount """ compute debit/credit from amount
""" """
if isinstance(values, dict): if isinstance(values, dict):
type_ = values.get('bookingtype', None) type_ = values.get('bookingtype', getattr(line, 'bookingtype', None))
amount = values.get('amount', None) amount = values.get('amount', None)
else : else :
type_ = getattr(values, 'bookingtype', None) type_ = getattr(values, 'bookingtype', getattr(line, 'bookingtype', None))
amount = getattr(values, 'amount', None) amount = getattr(values, 'amount', None)
result = {} result = {}
@ -1040,12 +1040,20 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
values2 = {} values2 = {}
values2.update(values) values2.update(values)
values2.update(cls.clear_by_bookingtype(values, line)) values2.update(cls.clear_by_bookingtype(values, line))
# select required fields in case on 'bookingtype'
updt_fields = []
updt_fields.extend(values.keys())
if 'bookingtype' in values.keys():
updt_fields.extend([x for x in fields_update if x not in values.keys()])
values2.update(cls.get_debit_credit({ values2.update(cls.get_debit_credit({
x:values.get(x, getattr(line, x)) for x in fields_update x:values.get(x, getattr(line, x)) for x in updt_fields
}, line=line)) }, line=line))
to_write.extend([lines, values2]) to_write.extend([lines, values2])
else : else :
to_write.extend([lines, values]) to_write.extend([lines, values])
super(Line, cls).write(*to_write) super(Line, cls).write(*to_write)
@classmethod @classmethod