splitline: add-2nd-unit-values extendable, new field 'feature'

This commit is contained in:
Frederik Jaeckel 2023-01-15 17:21:34 +01:00
parent 11d6183d65
commit 82ae7d7bca
6 changed files with 36 additions and 8 deletions

View file

@ -766,6 +766,10 @@ msgctxt "help:cashbook.split,rate_2nd_currency:"
msgid "Exchange rate between the currencies of the participating cashbooks."
msgstr "Wechselkurs zwischen der Währungen der beteiligten Kassenbücher."
msgctxt "field:cashbook.split,feature:"
msgid "Feature"
msgstr "Merkmal"
#################
# cashbook.line #

View file

@ -726,6 +726,10 @@ msgctxt "help:cashbook.split,rate_2nd_currency:"
msgid "Exchange rate between the currencies of the participating cashbooks."
msgstr "Exchange rate between the currencies of the participating cashbooks."
msgctxt "field:cashbook.split,feature:"
msgid "Feature"
msgstr "Feature"
msgctxt "model:cashbook.line,name:"
msgid "Cashbook Line"
msgstr "Cashbook Line"

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.
@ -84,6 +84,8 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
cashbook = fields.Function(fields.Many2One(string='Cashbook',
readonly=True, states={'invisible': True}, model_name='cashbook.book'),
'on_change_with_cashbook')
feature = fields.Function(fields.Char(string='Feature', readonly=True,
states={'invisible': True}), 'on_change_with_feature')
state_cashbook = fields.Function(fields.Selection(string='State of Cashbook',
readonly=True, states={'invisible': True}, selection=sel_state_book),
'on_change_with_state_cashbook')
@ -187,6 +189,13 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
if self.line:
return self.line.bookingtype
@fields.depends('line', '_parent_line.cashbook')
def on_change_with_feature(self, name=None):
""" get feature-set
"""
if self.line:
return self.line.cashbook.btype.feature
@fields.depends('line', '_parent_line.cashbook')
def on_change_with_currency(self, name=None):
""" currency of cashbook
@ -203,6 +212,17 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
else:
return 2
@classmethod
def add_2nd_unit_values(cls, values):
""" extend create-values
"""
Line2 = Pool().get('cashbook.line')
line = Line2(values.get('line', None))
if line:
values.update(cls.add_2nd_currency(values, line.cashbook.currency))
return values
@classmethod
def create(cls, vlist):
""" add debit/credit
@ -211,10 +231,7 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
vlist = [x.copy() for x in vlist]
for values in vlist:
line = Line2(values.get('line', None))
if line:
values.update(cls.add_2nd_currency(values, line.cashbook.currency))
values.update(cls.add_2nd_unit_values(values))
records = super(SplitLine, cls).create(vlist)
to_update_line = []

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.
@ -84,6 +84,7 @@ class SplitLineTestCase(ModuleTestCase):
self.assertEqual(books[0].lines[0].splitlines[1].rec_name,
'Rev/Sp|6.00 usd|from cashbook [Book 2 | 0.00 usd | Open]')
self.assertEqual(len(books[1].lines), 0)
self.assertEqual(books[0].lines[0].splitlines[0].feature, 'gen')
# wf: edit -> check
Line.wfcheck(books[0].lines)

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. -->
<form col="4">
@ -27,4 +27,5 @@ full copyright notices and license terms. -->
<field name="description"/>
</page>
</notebook>
<field name="feature"/>
</form>

View file

@ -1,9 +1,10 @@
<?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. -->
<tree editable="1">
<field name="line" tree_invisible="1"/>
<field name="feature" tree_invisible="1"/>
<field name="splittype"/>
<field name="category"/>
<field name="booktransf"/>