Version 6.0.20

den korrekten wert,
book-form: feld für saldo in unternehmens-währung

README.rst

@@ -14,6 +14,90 @@ Requires
 Changes
 =======
 
+*6.0.20 - 16.11.2022*
+
+- add: new state 'reconciled' at line
+
+*6.0.19 - 19.10.2022*
+
+- fix: delete()
+
+*6.0.18 - 11.10.2022*
+
+- updt: optimized open/view of cashbook
+
+*6.0.17 - 10.10.2022*
+
+- add: colors for cashbook-lines
+- add: client stores tree-state of cashbook
+
+*6.0.16 - 07.10.2022*
+
+- add: open cashbook-lines from cashbook
+
+*6.0.15 - 04.10.2022*
+
+- updt: second-currency support optimized
+
+*6.0.14 - 30.09.2022*
+
+- fix: parameter
+
+*6.0.13 - 28.09.2022*
+
+- hierarchical ordering for cashbook
+- forms optimzed
+
+*6.0.12 - 18.09.2022*
+
+- add: selected cashbooks in 'enter-booking-dialog'
+
+*6.0.11 - 16.09.2022*
+
+- add: hierarchy for cashbooks
+
+*6.0.10 - 13.09.2022*
+
+- add: split-booking with transfer
+
+*6.0.9 - 08.09.2022*
+
+- updt: allow negative amounts
+
+*6.0.8 - 07.09.2022*
+
+- updt: enter-booking form optimized
+
+*6.0.7 - 07.09.2022*
+
+- add: enter-booking-wizard
+
+*6.0.6 - 06.09.2022*
+
+- updt: optimized form - line, line-context
+- updt: extended search in cashbook-lines
+
+*6.0.5 - 05.09.2022*
+
+- updt: view of book + line optimized
+
+*6.0.4 - 05.09.2022*
+
+- fix: write number at state-change 'check' -> 'done'
+- updt: speedup transaction view
+
+*6.0.3 - 31.08.2022*
+
+- updt: checks, sorting
+
+*6.0.2 - 25.08.2022*
+
+- add: split-booking
+
+*6.0.1 - 23.08.2022*
+
+- works
+
 *6.0.0 - 05.08.2022*
 
 - init

__init__.py

@@ -8,8 +8,9 @@ from .book import Book
 from .types import Type
 from .line import Line, LineContext
 from .splitline import SplitLine
-from .wizard_openline import OpenCashBook, OpenCashBookStart
+from .wizard_openline import OpenCashBook, OpenCashBookStart, OpenCashBookTree
 from .wizard_runreport import RunCbReport, RunCbReportStart
+from .wizard_booking import EnterBookingWizard, EnterBookingStart
 from .configuration import Configuration, UserConfiguration
 from .category import Category
 from .reconciliation import Reconciliation
@@ -28,11 +29,14 @@ def register():
         Reconciliation,
         OpenCashBookStart,
         RunCbReportStart,
+        EnterBookingStart,
         module='cashbook', type_='model')
     Pool.register(
         ReconciliationReport,
         module='cashbook', type_='report')
     Pool.register(
         OpenCashBook,
+        OpenCashBookTree,
         RunCbReport,
+        EnterBookingWizard,
         module='cashbook', type_='wizard')

book.py

@@ -3,16 +3,19 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import Workflow, ModelView, ModelSQL, fields, Check
-from trytond.pyson import Eval, Or, Bool, Id
+from trytond.model import Workflow, ModelView, ModelSQL, fields, Check, tree
+from trytond.pyson import Eval, Or, Bool, Id, Len
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from trytond.report import Report
 from decimal import Decimal
+from sql import Literal
 from sql.aggregate import Sum
-from sql.conditionals import Case
+from sql.conditionals import Case, Coalesce
+from sql.functions import CurrentDate
+from .model import order_name_hierarchical
 
 
 STATES = {
@@ -20,6 +23,19 @@ STATES = {
     }
 DEPENDS=['state']
 
+# states in case of 'btype'!=None
+STATES2 = {
+    'readonly': Or(
+            Eval('state', '') != 'open',
+            ~Bool(Eval('btype')),
+        ),
+    'invisible': ~Bool(Eval('btype')),
+    }
+STATES3 = {}
+STATES3.update(STATES2)
+STATES3['required'] = ~STATES2['invisible']
+DEPENDS2 = ['state', 'btype']
+
 sel_state_book = [
     ('open', 'Open'),
     ('closed', 'Closed'),
@@ -27,7 +43,7 @@ sel_state_book = [
     ]
 
 
-class Book(Workflow, ModelSQL, ModelView):
+class Book(tree(separator='/'), Workflow, ModelSQL, ModelView):
     'Cashbook'
     __name__ = 'cashbook.book'
 
@@ -35,9 +51,17 @@ class Book(Workflow, ModelSQL, ModelView):
         required=True, ondelete="RESTRICT")
     name = fields.Char(string='Name', required=True,
         states=STATES, depends=DEPENDS)
-    btype = fields.Many2One(string='Type', required=True,
-        model_name='cashbook.type', ondelete='RESTRICT',
+    description = fields.Text(string='Description',
         states=STATES, depends=DEPENDS)
+    btype = fields.Many2One(string='Type',
+        help='A cash book with type can contain postings. Without type is a view.',
+        model_name='cashbook.type', ondelete='RESTRICT',
+        states={
+            'readonly': Or(
+                    STATES['readonly'],
+                    Len(Eval('lines')) > 0,
+                ),
+        }, depends=DEPENDS+['lines'])
     owner = fields.Many2One(string='Owner', required=True, select=True,
         model_name='res.user', ondelete='SET NULL',
         states=STATES, depends=DEPENDS)
@@ -54,8 +78,8 @@ class Book(Workflow, ModelSQL, ModelView):
         states=STATES, depends=DEPENDS)
     reconciliations = fields.One2Many(string='Reconciliations',
         field='cashbook', model_name='cashbook.recon',
-        states=STATES, depends=DEPENDS)
-    number_sequ = fields.Many2One(string='Line numbering', required=True,
+        states=STATES2, depends=DEPENDS2)
+    number_sequ = fields.Many2One(string='Line numbering',
         help='Number sequence for numbering of the cash book lines.',
         model_name='ir.sequence',
         domain=[
@@ -65,41 +89,76 @@ class Book(Workflow, ModelSQL, ModelView):
                 ('company', '=', Eval('company', -1)),
                 ],
             ],
-        states=STATES, depends=DEPENDS+['company'])
+        states=STATES3, depends=DEPENDS2+['company'])
     number_atcheck = fields.Boolean(string="number when 'Checking'",
-        help="The numbering of the lines is done in the step Check. If the check mark is inactive, this happens with Done.")
-    start_date = fields.Date(string='Initial Date', required=True,
+        help="The numbering of the lines is done in the step Check. If the check mark is inactive, this happens with Done.",
+        states=STATES2, depends=DEPENDS2)
+    start_date = fields.Date(string='Initial Date',
         states={
             'readonly': Or(
-                STATES['readonly'],
-                Bool(Eval('lines')),
+                STATES2['readonly'],
+                Len(Eval('lines')) > 0,
                 ),
-        }, depends=DEPENDS+['lines'])
-    start_balance = fields.Numeric(string='Initial Amount', required=True,
+            'invisible': STATES2['invisible'],
+            'required': ~STATES2['invisible'],
+        }, depends=DEPENDS2+['lines'])
+    balance = fields.Function(fields.Numeric(string='Balance', readonly=True,
+        help='Balance of bookings to date',
+        digits=(16, Eval('currency_digits', 2)),
+        depends=['currency_digits']), 'on_change_with_balance')
+    balance_all = fields.Function(fields.Numeric(string='Total balance',
+        readonly=True, help='Balance of all bookings',
+        digits=(16, Eval('currency_digits', 2)),
+        depends=['currency_digits']), 'on_change_with_balance_all')
+
+    balance_ref = fields.Function(fields.Numeric(string='Balance (Ref.)',
+        help='Balance in company currency',
+        readonly=True, digits=(16, Eval('company_currency_digits', 2)),
         states={
-            'readonly': Or(
-                STATES['readonly'],
-                Bool(Eval('lines')),
-                ),
-        }, depends=DEPENDS+['lines'])
-    balance = fields.Function(fields.Numeric(string='Balance', readonly=True),
-        'on_change_with_balance')
-    currency = fields.Many2One(string='Currency', required=True,
+            'invisible': ~Bool(Eval('company_currency')),
+        }, depends=['company_currency_digits', 'company_currency']),
+        'on_change_with_balance_ref')
+    company_currency = fields.Function(fields.Many2One(readonly=True,
+        string='Company Currency', states={'invisible': True},
+        model_name='currency.currency'),
+        'on_change_with_company_currency')
+    company_currency_digits = fields.Function(fields.Integer(
+        string='Currency Digits (Ref.)', readonly=True),
+        'on_change_with_currency_digits')
+
+    currency = fields.Many2One(string='Currency', select=True,
         model_name='currency.currency',
         states={
             'readonly': Or(
-                STATES['readonly'],
-                Bool(Eval('lines', [])),
+                STATES2['readonly'],
+                Len(Eval('lines', [])) > 0,
                 ),
-        }, depends=DEPENDS+['lines'])
+        }, depends=DEPENDS2+['lines'])
+    currency_digits = fields.Function(fields.Integer(string='Currency Digits',
+        readonly=True), 'on_change_with_currency_digits')
     state = fields.Selection(string='State', required=True,
         readonly=True, selection=sel_state_book)
     state_string = state.translated('state')
 
+    parent = fields.Many2One(string="Parent",
+        model_name='cashbook.book', ondelete='RESTRICT',
+        left='left', right='right')
+    childs = fields.One2Many(string='Children', field='parent',
+        model_name='cashbook.book')
+    left = fields.Integer(string='Left', required=True, select=True)
+    right = fields.Integer(string='Right', required=True, select=True)
+
+    @classmethod
+    def __register__(cls, module_name):
+        super(Book, cls).__register__(module_name)
+
+        table = cls.__table_handler__(module_name)
+        table.drop_column('start_balance')
+
     @classmethod
     def __setup__(cls):
         super(Book, cls).__setup__()
-        cls._order.insert(0, ('name', 'ASC'))
+        cls._order.insert(0, ('rec_name', 'ASC'))
         cls._order.insert(0, ('state', 'ASC'))
         t = cls.__table__()
         cls._sql_constraints.extend([
@@ -127,16 +186,18 @@ class Book(Workflow, ModelSQL, ModelView):
                 },
             })
 
+    @staticmethod
+    def default_left():
+        return 0
+
+    @staticmethod
+    def default_right():
+        return 0
+
     @classmethod
     def default_number_atcheck(cls):
         return True
 
-    @classmethod
-    def default_start_balance(cls):
-        """ zero
-        """
-        return Decimal('0.0')
-
     @classmethod
     def default_currency(cls):
         """ currency of company
@@ -186,38 +247,146 @@ class Book(Workflow, ModelSQL, ModelView):
                 )
         return [query]
 
+    @staticmethod
+    def order_rec_name(tables):
+        """ order by pos
+            a recursive sorting
+        """
+        return order_name_hierarchical('cashbook.book', tables)
+
     def get_rec_name(self, name):
         """ name, balance, state
         """
-        return '%(name)s | %(balance)s %(symbol)s | %(state)s' % {
-            'name': self.name or '-',
-            'balance': Report.format_number(self.balance or 0.0, None),
-            'symbol': getattr(self.currency, 'symbol', '-'),
-            'state': self.state_string,
-            }
+        recname = super(Book, self).get_rec_name(name)
+        if self.btype:
+            return '%(name)s | %(balance)s %(symbol)s | %(state)s' % {
+                'name': recname or '-',
+                'balance': Report.format_number(self.balance or 0.0, None),
+                'symbol': getattr(self.currency, 'symbol', '-'),
+                'state': self.state_string,
+                }
+        return recname
 
-    @fields.depends('id', 'start_balance')
-    def on_change_with_balance(self, name=None):
+    def get_balance_of_cashbooks(self, date_limit=True):
         """ compute balance
         """
-        Line = Pool().get('cashbook.line')
-        tab_line = Line.__table__()
-        cursor = Transaction().connection.cursor()
+        pool = Pool()
+        Book2 = pool.get('cashbook.book')
+        Book3 = pool.get('cashbook.book')
+        Line = pool.get('cashbook.line')
+        Currency = pool.get('currency.currency')
+        IrDate = pool.get('ir.date')
 
-        query = tab_line.select(
+        tab_line = Line.__table__()
+        tab_book = Book3.__table__()
+        cursor = Transaction().connection.cursor()
+        context = Transaction().context
+
+        # select cashbook-lines from current cashbook and below
+        query = [
+                ('cashbook.id', 'in', Book2.search([
+                        ('parent', 'child_of', [self.id]),
+                    ], query=True)),
+            ]
+        if date_limit == True:
+            dt1 = context.get('date', None)
+            dt2 = IrDate.today()
+            if not isinstance(dt1, type(dt2)):
+                dt1 = dt2
+            query.append(
+                    ('date', '<=', dt1)
+                )
+        line_query = Line.search(query, query=True)
+
+        # sum lines by currency
+        bal_by_currency = line_query.join(tab_line,
+                condition=tab_line.id==line_query.id,
+            ).join(tab_book,
+                condition=tab_book.id==tab_line.cashbook,
+            ).select(
                 Sum(tab_line.credit - tab_line.debit).as_('balance'),
-                group_by=[tab_line.cashbook],
-                where=tab_line.cashbook == self.id
+                tab_book.currency,
+                group_by=[tab_book.currency],
             )
 
         if self.id:
-            if self.start_balance is not None:
-                balance = self.start_balance
-                cursor.execute(*query)
-                result = cursor.fetchone()
-                if result:
+            total = Decimal('0.0')
+
+            cursor.execute(*bal_by_currency)
+            balance_lines = cursor.fetchall()
+
+            for line in balance_lines:
+                (balance, id_currency) = line
+
+                total += Currency.compute(
+                        Currency(id_currency),  # from
+                        balance,
+                        self.currency, # to
+                    )
+            return total
+
+    @fields.depends('currency')
+    def on_change_with_currency_digits(self, name=None):
+        """ currency of cashbook
+        """
+        if self.currency:
+            return self.currency.digits
+        else:
+            return 2
+
+    @fields.depends('company', 'currency', 'btype')
+    def on_change_with_company_currency(self, name=None):
+        """ get company-currency if its different from current
+            cashbook-currency, disable if book is a view
+        """
+        if self.company:
+            if self.currency:
+                if self.btype:
+                    if self.company.currency.id != self.currency.id:
+                        return self.company.currency.id
+
+    @fields.depends('id')
+    def on_change_with_balance(self, name=None):
+        """ compute balance until today
+        """
+        return self.get_balance_of_cashbooks()
+
+    @fields.depends('id')
+    def on_change_with_balance_all(self, name=None):
+        """ compute balance of all bookings
+        """
+        return self.get_balance_of_cashbooks(date_limit=False)
+
+    @fields.depends('company', 'currency', 'id', 'btype')
+    def on_change_with_balance_ref(self, name=None):
+        """ balance converted to company-currency
+        """
+        pool = Pool()
+        Line = pool.get('cashbook.line')
+        tab_line = Line.__table__()
+        cursor = Transaction().connection.cursor()
+
+        if self.btype is None:
+            return None
+
+        query = tab_line.select(
+                Sum(tab_line.credit - tab_line.debit),
+                where = tab_line.cashbook == self.id,
+            )
+
+        if self.id:
+            cursor.execute(*query)
+            result = cursor.fetchone()
+            balance = Decimal('0.0')
+            if result:
+                if result[0] is not None:
                     balance += result[0]
-                return balance
+            if self.currency:
+                return self.currency.compute(
+                        self.currency,          # from
+                        balance,
+                        self.company.currency   # to
+                    )
 
     @classmethod
     @ModelView.button
@@ -247,15 +416,21 @@ class Book(Workflow, ModelSQL, ModelView):
     def write(cls, *args):
         """ deny update if book is not 'open'
         """
+        ConfigUser = Pool().get('cashbook.configuration_user')
+
         actions = iter(args)
+        to_write_config = []
         for books, values in zip(actions, actions):
             for book in books:
-                if 'start_balance' in values.keys():
-                    if len(book.lines) > 0:
+                # deny btype-->None if lines not empty
+                if 'btype' in values.keys():
+                    if (values['btype'] is None) and (len(book.lines) > 0):
                         raise UserError(gettext(
-                            'cashbook.msg_book_err_startamount_with_lines',
-                            bookname = book.rec_name,
+                            'cashbook.msg_book_btype_with_lines',
+                            cbname = book.rec_name,
+                            numlines = len(book.lines),
                             ))
+
                 if book.state != 'open':
                     # allow state-update, if its the only action
                     if not (('state' in values.keys()) and (len(values.keys()) == 1)):
@@ -264,8 +439,23 @@ class Book(Workflow, ModelSQL, ModelView):
                             bookname = book.rec_name,
                             state_txt = book.state_string,
                             ))
+
+                # if owner changes, remove book from user-config
+                if 'owner' in values.keys():
+                    if book.owner.id != values['owner']:
+                        for x in ['defbook', 'book1', 'book2', 'book3',
+                            'book4', 'book5']:
+                            cfg1 = ConfigUser.search([
+                                    ('iduser.id', '=', book.owner.id),
+                                    ('%s.id' % x, '=', book.id),
+                                ])
+                            if len(cfg1) > 0:
+                                to_write_config.extend([ cfg1, {x: None} ])
         super(Book, cls).write(*args)
 
+        if len(to_write_config) > 0:
+            ConfigUser.write(*to_write_config)
+
     @classmethod
     def delete(cls, books):
         """ deny delete if book has lines
@@ -277,6 +467,6 @@ class Book(Workflow, ModelSQL, ModelView):
                     bookname = book.rec_name,
                     booklines = len(book.lines),
                     ))
-        return super(Book, cls).delete(books)
+        super(Book, cls).delete(books)
 
 # end Book

book.xml

@@ -12,6 +12,13 @@ full copyright notices and license terms. -->
             <field name="priority" eval="10"/>
             <field name="name">book_list</field>
         </record>
+        <record model="ir.ui.view" id="book_view_tree">
+            <field name="model">cashbook.book</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="10"/>
+            <field name="field_childs">childs</field>
+            <field name="name">book_tree</field>
+        </record>
         <record model="ir.ui.view" id="book_view_form">
             <field name="model">cashbook.book</field>
             <field name="type">form</field>
@@ -19,7 +26,7 @@ full copyright notices and license terms. -->
             <field name="name">book_form</field>
         </record>
 
-        <!-- action view-->
+        <!-- action view - list -->
         <record model="ir.action.act_window" id="act_book_view">
             <field name="name">Cashbook</field>
             <field name="res_model">cashbook.book</field>
@@ -35,6 +42,23 @@ full copyright notices and license terms. -->
             <field name="act_window" ref="act_book_view"/>
         </record>
 
+        <!-- action view - tree -->
+        <record model="ir.action.act_window" id="act_book_tree">
+            <field name="name">Cashbook</field>
+            <field name="res_model">cashbook.book</field>
+            <field name="domain" eval="[('parent', '=', None)]" pyson="1"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_book_tree-1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="book_view_tree"/>
+            <field name="act_window" ref="act_book_tree"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_book_tree-2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="book_view_form"/>
+            <field name="act_window" ref="act_book_tree"/>
+        </record>
+
         <!-- permission -->
         <!-- anon: deny all -->
         <record model="ir.model.access" id="access_book-anon">
@@ -251,18 +275,24 @@ full copyright notices and license terms. -->
             <field name="perm_read" eval="False"/>
             <field name="perm_write" eval="False"/>
         </record>
-        <record model="ir.model.field.access" id="fa_book-start_balance-anon">
-            <field name="field"
-                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'start_balance')]"/>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-        </record>
         <record model="ir.model.field.access" id="fa_book-currency-anon">
             <field name="field"
                 search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'currency')]"/>
             <field name="perm_read" eval="False"/>
             <field name="perm_write" eval="False"/>
         </record>
+        <record model="ir.model.field.access" id="fa_book-parent-anon">
+            <field name="field"
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'parent')]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+        </record>
+        <record model="ir.model.field.access" id="fa_book-childs-anon">
+            <field name="field"
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'childs')]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+        </record>
 
         <!-- field-access - group_cashbook_admin -->
         <record model="ir.model.field.access" id="fa_book-company-group_cashbook_admin">
@@ -335,16 +365,23 @@ full copyright notices and license terms. -->
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
         </record>
-        <record model="ir.model.field.access" id="fa_book-start_balance-group_cashbook_admin">
+        <record model="ir.model.field.access" id="fa_book-currency-group_cashbook_admin">
             <field name="field"
-                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'start_balance')]"/>
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'currency')]"/>
             <field name="group" ref="group_cashbook_admin"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
         </record>
-        <record model="ir.model.field.access" id="fa_book-currency-group_cashbook_admin">
+        <record model="ir.model.field.access" id="fa_book-parent-group_cashbook_admin">
             <field name="field"
-                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'currency')]"/>
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'parent')]"/>
+            <field name="group" ref="group_cashbook_admin"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+        </record>
+        <record model="ir.model.field.access" id="fa_book-childs-group_cashbook_admin">
+            <field name="field"
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'childs')]"/>
             <field name="group" ref="group_cashbook_admin"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="True"/>
@@ -421,16 +458,23 @@ full copyright notices and license terms. -->
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="False"/>
         </record>
-        <record model="ir.model.field.access" id="fa_book-start_balance-group_cashbook">
+        <record model="ir.model.field.access" id="fa_book-currency-group_cashbook">
             <field name="field"
-                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'start_balance')]"/>
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'currency')]"/>
             <field name="group" ref="group_cashbook"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="False"/>
         </record>
-        <record model="ir.model.field.access" id="fa_book-currency-group_cashbook">
+        <record model="ir.model.field.access" id="fa_book-parent-group_cashbook">
             <field name="field"
-                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'currency')]"/>
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'parent')]"/>
+            <field name="group" ref="group_cashbook"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+        </record>
+        <record model="ir.model.field.access" id="fa_book-childs-group_cashbook">
+            <field name="field"
+                search="[('model.model', '=', 'cashbook.book'), ('name', '=', 'childs')]"/>
             <field name="group" ref="group_cashbook"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="False"/>

category.py

@@ -3,12 +3,14 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import ModelView, ModelSQL, fields, Unique, tree, sequence_ordered
+from trytond.model import ModelView, ModelSQL, fields, Unique, Exclude, tree
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from trytond.pyson import Eval, If, Bool
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
+from sql.operators import Equal
+from .model import order_name_hierarchical
 
 
 sel_categorytype = [
@@ -17,7 +19,7 @@ sel_categorytype = [
     ]
 
 
-class Category(tree(separator='/'), sequence_ordered(), ModelSQL, ModelView):
+class Category(tree(separator='/'), ModelSQL, ModelView):
     'Category'
     __name__ = 'cashbook.category'
 
@@ -36,7 +38,6 @@ class Category(tree(separator='/'), sequence_ordered(), ModelSQL, ModelView):
 
     company = fields.Many2One(string='Company', model_name='company.company',
         required=True, ondelete="RESTRICT")
-    sequence = fields.Integer(string='Sequence', select=True)
     parent = fields.Many2One(string="Parent",
         model_name='cashbook.category', ondelete='RESTRICT',
         left='left', right='right')
@@ -45,15 +46,35 @@ class Category(tree(separator='/'), sequence_ordered(), ModelSQL, ModelView):
     left = fields.Integer(string='Left', required=True, select=True)
     right = fields.Integer(string='Right', required=True, select=True)
 
+    @classmethod
+    def __register__(cls, module_name):
+        super(Category, cls).__register__(module_name)
+        cls.migrate_sequence(module_name)
+
     @classmethod
     def __setup__(cls):
         super(Category, cls).__setup__()
-        cls._order.insert(0, ('name', 'ASC'))
+        cls._order.insert(0, ('rec_name', 'ASC'))
         t = cls.__table__()
         cls._sql_constraints.extend([
-                ('name_uniq', Unique(t, t.name, t.company, t.parent), 'cashbook.msg_category_name_unique'),
+                ('name_uniq',
+                    Unique(t, t.name, t.company, t.parent),
+                    'cashbook.msg_category_name_unique'),
+                ('name2_uniq',
+                    Exclude(t,
+                        (t.name, Equal),
+                        (t.cattype, Equal),
+                        where=(t.parent == None)),
+                    'cashbook.msg_category_name_unique'),
             ])
 
+    @classmethod
+    def migrate_sequence(cls, module_name):
+        """ remove colum 'sequence'
+        """
+        table = cls.__table_handler__(module_name)
+        table.drop_column('sequence')
+
     @classmethod
     def default_cattype(cls):
         return 'out'
@@ -70,6 +91,13 @@ class Category(tree(separator='/'), sequence_ordered(), ModelSQL, ModelView):
     def default_right():
         return 0
 
+    @staticmethod
+    def order_rec_name(tables):
+        """ order by pos
+            a recursive sorting
+        """
+        return order_name_hierarchical('cashbook.category', tables)
+
     @fields.depends('parent', '_parent_parent.cattype')
     def on_change_with_parent_cattype(self, name=None):
         """ get type of parent category or None

category.xml

@@ -42,6 +42,20 @@ full copyright notices and license terms. -->
             <field name="act_window" ref="act_category_list"/>
         </record>
 
+        <!-- domain view - list -->
+        <record model="ir.action.act_window.domain" id="act_category_list_domain_in">
+            <field name="name">Revenue</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('cattype', '=', 'in')]" pyson="1"/>
+            <field name="act_window" ref="act_category_list"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_category_list_domain_out">
+            <field name="name">Expense</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('cattype', '=', 'out')]" pyson="1"/>
+            <field name="act_window" ref="act_category_list"/>
+        </record>
+
         <!-- action view - tree -->
         <record model="ir.action.act_window" id="act_category_tree">
             <field name="name">Category</field>
@@ -59,6 +73,21 @@ full copyright notices and license terms. -->
             <field name="act_window" ref="act_category_tree"/>
         </record>
 
+        <!-- domain view - tree -->
+        <record model="ir.action.act_window.domain" id="act_category_tree_domain_in">
+            <field name="name">Revenue</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('cattype', '=', 'in')]" pyson="1"/>
+            <field name="act_window" ref="act_category_tree"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_category_tree_domain_out">
+            <field name="name">Expense</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('cattype', '=', 'out')]" pyson="1"/>
+            <field name="act_window" ref="act_category_tree"/>
+        </record>
+
+
         <!-- permission -->
         <!-- anon: deny all -->
         <record model="ir.model.access" id="access_category-anon">

configuration.py

@@ -36,6 +36,42 @@ class Configuration(ModelSingleton, ModelSQL, ModelView, UserMultiValueMixin):
     checked = fields.MultiValue(field_checked)
     done = fields.MultiValue(field_done)
     catnamelong = fields.MultiValue(field_catnamelong)
+    defbook = fields.MultiValue(fields.Many2One(string='Default Cashbook',
+        help='The default cashbook is selected when you open the booking wizard.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None), ('state', '=', 'open'),
+            ]))
+    book1 = fields.MultiValue(fields.Many2One(string='Cashbook 1',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None), ('state', '=', 'open'),
+            ]))
+    book2 = fields.MultiValue(fields.Many2One(string='Cashbook 2',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None), ('state', '=', 'open'),
+            ]))
+    book3 = fields.MultiValue(fields.Many2One(string='Cashbook 3',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None), ('state', '=', 'open'),
+            ]))
+    book4 = fields.MultiValue(fields.Many2One(string='Cashbook 4',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None), ('state', '=', 'open'),
+            ]))
+    book5 = fields.MultiValue(fields.Many2One(string='Cashbook 5',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None), ('state', '=', 'open'),
+            ]))
 
     @classmethod
     def multivalue_model(cls, field):
@@ -44,7 +80,8 @@ class Configuration(ModelSingleton, ModelSQL, ModelView, UserMultiValueMixin):
         pool = Pool()
 
         if field in ['date_from', 'date_to', 'checked', 'done',
-            'catnamelong']:
+            'catnamelong', 'defbook', 'book1', 'book2',
+            'book3', 'book4', 'book5']:
             return pool.get('cashbook.configuration_user')
         return super(Configuration, cls).multivalue_model(field)
 
@@ -82,6 +119,54 @@ class UserConfiguration(ModelSQL, UserValueMixin):
     checked = field_checked
     done = field_done
     catnamelong = field_catnamelong
+    defbook = fields.Many2One(string='Default Cashbook',
+        help='The default cashbook is selected when you open the booking wizard.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None),
+            ('state', '=', 'open'),
+            ('owner.id', '=', Eval('iduser', -1))
+        ], depends=['iduser'])
+    book1 = fields.Many2One(string='Cashbook 1',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None),
+            ('state', '=', 'open'),
+            ('owner.id', '=', Eval('iduser', -1))
+        ], depends=['iduser'])
+    book2 = fields.Many2One(string='Cashbook 2',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None),
+            ('state', '=', 'open'),
+            ('owner.id', '=', Eval('iduser', -1))
+        ], depends=['iduser'])
+    book3 = fields.Many2One(string='Cashbook 3',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None),
+            ('state', '=', 'open'),
+            ('owner.id', '=', Eval('iduser', -1))
+        ], depends=['iduser'])
+    book4 = fields.Many2One(string='Cashbook 4',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None),
+            ('state', '=', 'open'),
+            ('owner.id', '=', Eval('iduser', -1))
+        ], depends=['iduser'])
+    book5 = fields.Many2One(string='Cashbook 5',
+        help='Cash book available in selection dialog.',
+        model_name='cashbook.book', ondelete='SET NULL',
+        domain=[
+            ('btype', '!=', None),
+            ('state', '=', 'open'),
+            ('owner.id', '=', Eval('iduser', -1))
+        ], depends=['iduser'])
 
     @classmethod
     def default_checked(cls):

line.py

@@ -5,16 +5,17 @@
 
 from trytond.model import ModelView, ModelSQL, Workflow, fields, Check
 from trytond.pool import Pool
-from trytond.pyson import Eval, If, Or, Bool
+from trytond.pyson import Eval, If, Or, Bool, Date
 from trytond.transaction import Transaction
 from trytond.report import Report
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
 from decimal import Decimal
-from sql import Cast, Literal
+from sql import Literal
 from sql.functions import DatePart
 from sql.conditionals import Case
 from .book import sel_state_book
+from .mixin import SecondCurrencyMixin
 
 
 sel_payee = [
@@ -25,6 +26,7 @@ sel_payee = [
 sel_linetype = [
     ('edit', 'Edit'),
     ('check', 'Checked'),
+    ('recon', 'Reconciled'),
     ('done', 'Done'),
     ]
 
@@ -46,19 +48,22 @@ STATES = {
 DEPENDS=['state', 'state_cashbook']
 
 
-class Line(Workflow, ModelSQL, ModelView):
+class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
     'Cashbook Line'
     __name__ = 'cashbook.line'
 
     cashbook = fields.Many2One(string='Cashbook', required=True, select=True,
-        model_name='cashbook.book', ondelete='CASCADE', readonly=True)
+        model_name='cashbook.book', ondelete='CASCADE', readonly=True,
+        domain=[('btype', '!=', None)])
     date = fields.Date(string='Date', required=True, select=True,
         states=STATES, depends=DEPENDS)
     month = fields.Function(fields.Integer(string='Month', readonly=True),
         'on_change_with_month', searcher='search_month')
     number = fields.Char(string='Number', readonly=True)
-    description = fields.Text(string='Description',
+    description = fields.Text(string='Description', select=True,
         states=STATES, depends=DEPENDS)
+    descr_short = fields.Function(fields.Char(string='Description', readonly=True),
+        'on_change_with_descr_short', searcher='search_descr_short')
     category = fields.Many2One(string='Category',
         model_name='cashbook.category', ondelete='RESTRICT',
         states={
@@ -101,6 +106,7 @@ class Line(Workflow, ModelSQL, ModelView):
         domain=[
             ('owner.id', '=', Eval('owner_cashbook', -1)),
             ('id', '!=', Eval('cashbook', -1)),
+            ('btype', '!=', None),
             ],
         states={
             'readonly': STATES['readonly'],
@@ -171,6 +177,15 @@ class Line(Workflow, ModelSQL, ModelView):
 
     #image = fields.Binary...
 
+    @classmethod
+    def __register__(cls, module_name):
+        super(Line, cls).__register__(module_name)
+
+        table = cls.__table_handler__(module_name)
+        table.drop_constraint('amount_val')
+        table.drop_constraint('state_val')
+        cls.migrate_amount_2nd_currency()
+
     @classmethod
     def __setup__(cls):
         super(Line, cls).__setup__()
@@ -178,13 +193,14 @@ class Line(Workflow, ModelSQL, ModelView):
         cls._order.insert(0, ('state', 'ASC'))
         t = cls.__table__()
         cls._sql_constraints.extend([
-            ('state_val',
-                Check(t, t.state.in_(['edit', 'check', 'done'])),
+            ('state_val2',
+                Check(t, t.state.in_(['edit', 'check', 'done', 'recon'])),
                 'cashbook.msg_line_wrong_state_value'),
             ])
         cls._transitions |= set((
                 ('edit', 'check'),
-                ('check', 'done'),
+                ('check', 'recon'),
+                ('recon', 'done'),
                 ('check', 'edit'),
             ))
         cls._buttons.update({
@@ -197,12 +213,67 @@ class Line(Workflow, ModelSQL, ModelView):
                 'invisible': Eval('state') != 'edit',
                 'depends': ['state'],
                 },
-            'wfdone': {
+            'wfrecon': {
                 'invisible': Eval('state') != 'check',
                 'depends': ['state'],
                 },
+            'wfdone': {
+                'invisible': Eval('state') != 'recon',
+                'depends': ['state'],
+                },
             })
 
+    @classmethod
+    def view_attributes(cls):
+        return super().view_attributes() + [
+            ('/tree', 'visual',
+                If(Eval('balance', 0) < 0, 'warning',
+                    If(Eval('date', Date()) > Date(), 'muted', '')
+                    )),
+            ]
+
+    @classmethod
+    def migrate_amount_2nd_currency(cls):
+        """ add amount-2nd-currency
+        """
+        pool = Pool()
+        Line2 = pool.get('cashbook.line')
+        Book = pool.get('cashbook.book')
+        Book2 = pool.get('cashbook.book')
+        tab_line = Line2.__table__()
+        tab_book = Book.__table__()         # cashbook of line
+        tab_book2 = Book2.__table__()       # transfer-target
+        cursor = Transaction().connection.cursor()
+
+        query = tab_line.join(tab_book,
+                condition=tab_line.cashbook == tab_book.id,
+            ).join(tab_book2,
+                condition=tab_line.booktransf== tab_book2.id,
+            ).select(tab_line.id,
+                where=tab_line.bookingtype.in_(['mvin', 'mvout']) & \
+                    (tab_line.amount_2nd_currency == None) & \
+                    (tab_book.currency != tab_book2.currency)
+            )
+        lines = Line2.search([('id', 'in', query)])
+        to_write = []
+        for line in lines:
+            values = Line2.add_2nd_currency({
+                'date': line.date,
+                'booktransf': line.booktransf.id,
+                'amount': line.amount,
+                }, line.currency)
+            if 'amount_2nd_currency' in values.keys():
+                values['id'] = line.id
+                to_write.append(values)
+
+        for line in to_write:
+            qu1 = tab_line.update(
+                    columns = [tab_line.amount_2nd_currency],
+                    values = [line['amount_2nd_currency']],
+                    where = tab_line.id == line['id'],
+                )
+            cursor.execute(*qu1)
+
     @classmethod
     @ModelView.button
     @Workflow.transition('edit')
@@ -270,19 +341,51 @@ class Line(Workflow, ModelSQL, ModelView):
                     'cashbook.msg_line_err_write_to_reconciled',
                     datetxt = Report.format_date(line.date),
                     ))
-            # in case of 'mvin' or 'mvout' - create counterpart
-            if (line.bookingtype in ['mvout', 'mvin']) and (line.reference is None):
-                values = {
-                    'cashbook': line.booktransf.id,
-                    'bookingtype': 'mvin' if line.bookingtype == 'mvout' else 'mvout',
-                    'date': line.date,
-                    'description': line.description,
-                    'booktransf': line.cashbook.id,
-                    'reference': line.id,
-                    }
-                values.update(line.get_amount_by_second_currency(line.booktransf.currency))
-                values.update(cls.get_debit_credit(values))
-                to_create_line.append(values)
+
+            if line.reference is None:
+                if line.bookingtype in ['mvout', 'mvin']:
+                    # in case of 'mvin' or 'mvout' - add counterpart
+                    values = {
+                        'cashbook': line.booktransf.id,
+                        'bookingtype': 'mvin' if line.bookingtype == 'mvout' else 'mvout',
+                        'date': line.date,
+                        'description': line.description,
+                        'booktransf': line.cashbook.id,
+                        'reference': line.id,
+                        'amount': line.amount \
+                            if line.currency.id == line.booktransf.currency.id \
+                            else line.amount_2nd_currency,
+                        'amount_2nd_currency': line.amount \
+                            if line.currency.id != line.booktransf.currency.id \
+                            else None,
+                        }
+                    values.update(cls.get_debit_credit(values))
+                    to_create_line.append(values)
+                elif line.bookingtype in ['spout', 'spin']:
+                    # splitbooking can have a transfer - add counterpart
+                    for sp_line in line.splitlines:
+                        if sp_line.splittype != 'tr':
+                            continue
+
+                        values = {
+                            'cashbook': sp_line.booktransf.id,
+                            'date': line.date,
+                            'description': sp_line.description,
+                            'booktransf': line.cashbook.id,
+                            'reference': line.id,
+                            'amount': sp_line.amount \
+                                if sp_line.currency.id == sp_line.booktransf.currency.id \
+                                else sp_line.amount_2nd_currency,
+                            'amount_2nd_currency': sp_line.amount \
+                                if sp_line.currency.id != sp_line.booktransf.currency.id \
+                                else None,
+                            }
+                        if line.bookingtype.endswith('out'):
+                            values['bookingtype'] = 'mvin'
+                        else :
+                            values['bookingtype'] = 'mvout'
+                        values.update(cls.get_debit_credit(values))
+                        to_create_line.append(values)
 
             # add number to line
             if line.cashbook.number_atcheck == True:
@@ -300,6 +403,14 @@ class Line(Workflow, ModelSQL, ModelView):
             new_lines = Line2.create(to_create_line)
             Line2.wfcheck(new_lines)
 
+    @classmethod
+    @ModelView.button
+    @Workflow.transition('recon')
+    def wfrecon(cls, lines):
+        """ line is reconciled
+        """
+        pass
+
     @classmethod
     @ModelView.button
     @Workflow.transition('done')
@@ -345,7 +456,12 @@ class Line(Workflow, ModelSQL, ModelView):
     def search_rec_name(cls, name, clause):
         """ search in description +...
         """
-        return [('description',) + tuple(clause[1:])]
+        return cls.search_payee(name, clause) + [
+            ('description',) + tuple(clause[1:]),
+            ('category.rec_name',) + tuple(clause[1:]),
+            ('splitlines.description',) + tuple(clause[1:]),
+            ('splitlines.category.rec_name',) + tuple(clause[1:]),
+            ]
 
     def get_rec_name(self, name):
         """ short + name
@@ -363,26 +479,6 @@ class Line(Workflow, ModelSQL, ModelView):
             'type': gettext('cashbook.msg_line_bookingtype_%s' % self.bookingtype),
             }
 
-    def get_amount_by_second_currency(self, to_currency, amount=None):
-        """ get amount, calculate credit/debit from currency of current
-            cashbook to 'to_currency'
-        """
-        Currency = Pool().get('currency.currency')
-
-        values = {
-            'amount': amount if amount is not None else self.amount,
-            }
-
-        if to_currency.id != self.cashbook.currency.id:
-            with Transaction().set_context({
-                'date': self.date,
-                }):
-                values['amount'] = Currency.compute(
-                        self.cashbook.currency,
-                        self.amount,
-                        to_currency)
-        return values
-
     @staticmethod
     def order_state(tables):
         """ edit = 0, check/done = 1
@@ -394,7 +490,7 @@ class Line(Workflow, ModelSQL, ModelView):
         query = tab_line.select(
                 Case(
                     (tab_line.state == 'edit', 1),
-                    (tab_line.state.in_(['check', 'done']), 0),
+                    (tab_line.state.in_(['check', 'recon', 'done']), 0),
                     else_ = 2),
                 where=tab_line.id==table.id
                 )
@@ -414,6 +510,13 @@ class Line(Workflow, ModelSQL, ModelView):
 
         return [tab2]
 
+    @staticmethod
+    def order_descr_short(tables):
+        """ order by 'description'
+        """
+        table, _ = tables[None]
+        return [table.description]
+
     @classmethod
     def search_payee(cls, names, clause):
         """ search in payee for party or cashbook
@@ -454,13 +557,20 @@ class Line(Workflow, ModelSQL, ModelView):
         """
         return [('cashbook.state',) + tuple(clause[1:])]
 
+    @classmethod
+    def search_descr_short(cls, names, clause):
+        """ search in description
+        """
+        return [('description',) + tuple(clause[1:])]
+
     @fields.depends('amount', 'splitlines')
     def on_change_splitlines(self):
         """ update amount if splitlines change
         """
         self.amount = sum([x.amount for x in self.splitlines if x.amount is not None])
 
-    @fields.depends('bookingtype', 'category', 'splitlines')
+    @fields.depends('bookingtype', 'category', 'splitlines', 'booktransf',\
+        'currency2nd')
     def on_change_bookingtype(self):
         """ clear category if not valid type
         """
@@ -474,12 +584,26 @@ class Line(Workflow, ModelSQL, ModelView):
                 if not self.bookingtype in types.get(self.category.cattype, ''):
                     self.category = None
 
-            if self.bookingtype in ['spin', 'spout']:
+            if self.bookingtype.startswith('sp'):   # split booking
+                self.category = None
+                self.booktransf = None
                 for spline in self.splitlines:
                     if not self.bookingtype in types.get(getattr(spline.category, 'cattype', '-'), ''):
                         spline.category = None
-            else :
+            elif self.bookingtype.startswith('mv'): # transfer
                 self.splitlines = []
+                self.category = None
+            else :                                  # category
+                self.splitlines = []
+                self.booktransf = None
+            self.currency2nd = self.on_change_with_currency2nd()
+
+    @fields.depends('description')
+    def on_change_with_descr_short(self, name=None):
+        """ to speed up list-view
+        """
+        if self.description:
+            return self.description[:50].replace('\n', '; ')
 
     @fields.depends('party', 'booktransf', 'bookingtype')
     def on_change_with_payee(self, name=None):
@@ -548,8 +672,9 @@ class Line(Workflow, ModelSQL, ModelView):
             return 2
 
     @fields.depends('id', 'date', 'cashbook', \
-        '_parent_cashbook.start_balance', '_parent_cashbook.id',\
-        'reconciliation', '_parent_reconciliation.start_amount')
+        '_parent_cashbook.id', 'reconciliation', \
+        '_parent_reconciliation.start_amount',\
+        '_parent_reconciliation.state')
     def on_change_with_balance(self, name=None):
         """ compute balance until current line, with current sort order,
             try to use a reconciliation as start to speed up calculation
@@ -558,31 +683,55 @@ class Line(Workflow, ModelSQL, ModelView):
         Reconciliation = pool.get('cashbook.recon')
         Line = pool.get('cashbook.line')
 
+        def get_from_last_recon(line2):
+            """ search last reconciliation in state 'done',
+                generate query
+            """
+            query2 = []
+            end_amount = None
+
+            recons = Reconciliation.search([
+                ('cashbook.id', '=', self.cashbook.id),
+                ('date_to', '<=', line2.date),
+                ('state', '=', 'done'),
+                ], order=[('date_from', 'DESC')], limit=1)
+            if len(recons) > 0:
+                query2.append([
+                        ('date', '>=', recons[0].date_to),
+                        ('date', '<=', line2.date),
+                        ['OR',
+                            ('reconciliation', '=', None),
+                            ('reconciliation.id', '!=', recons[0]),
+                        ],
+                    ])
+                end_amount = recons[0].end_amount
+            return (query2, end_amount)
+
         if self.cashbook:
             query = [
                 ('cashbook.id', '=', self.cashbook.id),
                 ]
-            balance = self.cashbook.start_balance
+            balance = Decimal('0.0')
 
             # get existing reconciliation, starting before current line
             # this will speed up calculation of by-line-balance
             if self.date is not None:
-                recons = Reconciliation.search([
-                    ('cashbook.id', '=', self.cashbook.id),
-                    ('date_from', '<=', self.date),
-                    ('state', '=', 'done'),
-                    ], order=[('date_from', 'DESC')], limit=1)
-                if len(recons) > 0:
-                    query.extend([
-                            ['OR',
-                                ('date', '>', recons[0].date_from),
-                                [
-                                    ('date', '=', recons[0].date_from),
-                                    ('reconciliation.id', '=',recons[0].id),
-                                ],
-                            ]
-                        ])
-                    balance = recons[0].start_amount
+                if self.reconciliation:
+                    if self.reconciliation.state == 'done':
+                        query.append(
+                            ('reconciliation.id', '=', self.reconciliation.id),
+                            )
+                        balance = self.reconciliation.start_amount
+                    else :
+                        (query2, balance2) = get_from_last_recon(self)
+                        query.extend(query2)
+                        if balance2 is not None:
+                            balance = balance2
+                else :
+                    (query2, balance2) = get_from_last_recon(self)
+                    query.extend(query2)
+                    if balance2 is not None:
+                        balance = balance2
 
             lines = Line.search(query)
             for line in lines:
@@ -689,6 +838,8 @@ class Line(Workflow, ModelSQL, ModelView):
 
             # splitline: category <--> bookingtype?
             for spline in line.splitlines:
+                if spline.splittype != 'cat':
+                    continue
                 if not line.bookingtype in types[spline.category.cattype]:
                     raise UserError(gettext(
                         'cashbook.msg_line_split_invalid_category',
@@ -722,7 +873,7 @@ class Line(Workflow, ModelSQL, ModelView):
             # deny write if line is not 'Edit'
             if line.state != 'edit':
                 # allow state-update, if its the only action
-                if not ((len(set({'state', 'reconciliation'}).intersection(values.keys())) > 0) \
+                if not ((len(set({'state', 'reconciliation', 'number'}).intersection(values.keys())) > 0) \
                     and (len(values.keys()) == 1)):
                     raise UserError(gettext(
                         'cashbook.msg_line_deny_write',
@@ -765,14 +916,20 @@ class Line(Workflow, ModelSQL, ModelView):
     def create(cls, vlist):
         """ add debit/credit
         """
+        Cashbook = Pool().get('cashbook.book')
+
         vlist = [x.copy() for x in vlist]
         for values in vlist:
             values.update(cls.get_debit_credit(values))
             values.update(cls.clear_by_bookingtype(values))
 
-            # deny add to reconciliation if state is not 'check' or 'done'
+            cashbook = values.get('cashbook', None)
+            if cashbook:
+                values.update(cls.add_2nd_currency(values, Cashbook(cashbook).currency))
+
+            # deny add to reconciliation if state is not 'check', 'recon' or 'done'
             if values.get('reconciliation', None):
-                if not values.get('state', '-') in ['check', 'done']:
+                if not values.get('state', '-') in ['check', 'done', 'recon']:
                     date_txt = '-'
                     if values.get('date', None):
                         date_txt = Report.format_date(values.get('date', None))
@@ -805,10 +962,10 @@ class Line(Workflow, ModelSQL, ModelView):
                             recname = line.rec_name,
                             ))
 
-            # deny add to reconciliation if state is not 'check' or 'done'
+            # deny add to reconciliation if state is not 'check', 'recon' or 'done'
             if values.get('reconciliation', None):
                 for line in lines:
-                    if not line.state in ['check', 'done']:
+                    if not line.state in ['check', 'done', 'recon']:
                         raise UserError(gettext(
                             'cashbook.msg_line_deny_recon_by_state',
                             recname = line.rec_name
@@ -833,7 +990,7 @@ class Line(Workflow, ModelSQL, ModelView):
         """ deny delete if book is not 'open' or wf is not 'edit'
         """
         cls.check_permission_delete(lines)
-        return super(Line, cls).delete(lines)
+        super(Line, cls).delete(lines)
 
 # end Line
 
@@ -842,18 +999,15 @@ class LineContext(ModelView):
     'Line Context'
     __name__ = 'cashbook.line.context'
 
-    cashbook = fields.Many2One(string='Cashbook', required=True,
-        model_name='cashbook.book',
-        states={
-            'readonly': Eval('num_cashbook', 0) < 2,
-        }, depends=['num_cashbook'])
     date_from = fields.Date(string='Start Date', depends=['date_to'],
+        help='Limits the date range for the displayed entries.',
         domain=[
             If(Eval('date_to') & Eval('date_from'),
                 ('date_from', '<=', Eval('date_to')),
                 ()),
             ])
     date_to = fields.Date(string='End Date', depends=['date_from'],
+        help='Limits the date range for the displayed entries.',
         domain=[
             If(Eval('date_to') & Eval('date_from'),
                 ('date_from', '<=', Eval('date_to')),
@@ -863,16 +1017,6 @@ class LineContext(ModelView):
         help='Show account lines in Checked-state.')
     done = fields.Boolean(string='Done',
         help='Show account lines in Done-state.')
-    num_cashbook = fields.Function(fields.Integer(string='Number of Cashbook',
-        readonly=True, states={'invisible': True}),
-        'on_change_with_num_cashbook')
-
-    @classmethod
-    def default_cashbook(cls):
-        """ get default from context
-        """
-        context = Transaction().context
-        return context.get('cashbook', None)
 
     @classmethod
     def default_date_from(cls):
@@ -895,17 +1039,6 @@ class LineContext(ModelView):
         context = Transaction().context
         return context.get('checked', False)
 
-    @classmethod
-    def default_num_cashbook(cls):
-        """ get default from context
-        """
-        CashBook = Pool().get('cashbook.book')
-
-        with Transaction().set_context({
-            '_check_access': True,
-            }):
-            return CashBook.search_count([])
-
     @classmethod
     def default_done(cls):
         """ get default from context
@@ -913,11 +1046,4 @@ class LineContext(ModelView):
         context = Transaction().context
         return context.get('done', False)
 
-    def on_change_with_num_cashbook(self, name=None):
-        """ get number of accessible cashbooks,
-            depends on user-permissions
-        """
-        LineContext = Pool().get('cashbook.line.context')
-        return LineContext.default_num_cashbook()
-
 # end LineContext

line.xml

@@ -18,6 +18,12 @@ full copyright notices and license terms. -->
             <field name="priority" eval="10"/>
             <field name="name">line_list</field>
         </record>
+        <record model="ir.ui.view" id="line_recon_view_list">
+            <field name="model">cashbook.line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="15"/>
+            <field name="name">line_recon_list</field>
+        </record>
         <record model="ir.ui.view" id="line_view_form">
             <field name="model">cashbook.line</field>
             <field name="type">form</field>
@@ -26,32 +32,34 @@ full copyright notices and license terms. -->
         </record>
 
         <!-- action view -->
-        <record model="ir.action.act_window" id="act_line_view">
+        <record model="ir.action.act_window" id="act_line_view2">
             <field name="name">Cashbook Line</field>
             <field name="res_model">cashbook.line</field>
             <field name="context_model">cashbook.line.context</field>
             <field name="context_domain"
                 eval="[
-                    ('cashbook', '=', Eval('cashbook', -1)),
                     If(Bool(Eval('date_from')), ('date', '&gt;=', Eval('date_from')), ()),
                     If(Bool(Eval('date_to')), ('date', '&lt;=', Eval('date_to')), ()),
                     ['OR',
                         ('state', '=', 'edit'),
                         If(Bool(Eval('done')), ('state', '=', 'done'), ('state', '=', 'edit')),
-                        If(Bool(Eval('checked')), ('state', '=', 'check'), ('state', '=', 'edit')),
+                        If(Bool(Eval('checked')), ('state', 'in', ['check', 'recon']), ('state', '=', 'edit')),
                     ],
                     ]"
                 pyson="1"/>
+            <field name="domain"
+                eval="[('cashbook', '=', Eval('cashbook', -1))]"
+                pyson="1"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_line_view-1">
+        <record model="ir.action.act_window.view" id="act_line_view2-1">
             <field name="sequence" eval="10"/>
             <field name="view" ref="line_view_list"/>
-            <field name="act_window" ref="act_line_view"/>
+            <field name="act_window" ref="act_line_view2"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_line_view-2">
+        <record model="ir.action.act_window.view" id="act_line_view2-2">
             <field name="sequence" eval="20"/>
             <field name="view" ref="line_view_form"/>
-            <field name="act_window" ref="act_line_view"/>
+            <field name="act_window" ref="act_line_view2"/>
         </record>
 
         <!-- domain view -->
@@ -60,20 +68,20 @@ full copyright notices and license terms. -->
             <field name="sequence" eval="10"/>
             <field name="domain" eval="[('month', '=', 0)]" pyson="1"/>
             <field name="count" eval="True"/>
-            <field name="act_window" ref="act_line_view"/>
+            <field name="act_window" ref="act_line_view2"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_line_domain_last">
             <field name="name">Last Month</field>
             <field name="sequence" eval="20"/>
             <field name="domain" eval="[('month', '=', 1)]" pyson="1"/>
             <field name="count" eval="True"/>
-            <field name="act_window" ref="act_line_view"/>
+            <field name="act_window" ref="act_line_view2"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_line_domain_all">
             <field name="name">All</field>
             <field name="sequence" eval="999"/>
             <field name="domain"/>
-            <field name="act_window" ref="act_line_view"/>
+            <field name="act_window" ref="act_line_view2"/>
         </record>
 
         <!-- permission -->
@@ -227,6 +235,28 @@ full copyright notices and license terms. -->
             <field name="group" ref="group_cashbook_doneline"/>
         </record>
 
+        <!-- button - recon -->
+        <record model="ir.model.button" id="line_wfrecon_button">
+            <field name="name">wfrecon</field>
+            <field name="string">Reconciled</field>
+            <field name="model" search="[('model', '=', 'cashbook.line')]"/>
+        </record>
+        <record model="ir.model.button-res.group"
+            id="line_wfrecon_button-group_cashbook_admin">
+            <field name="button" ref="line_wfrecon_button"/>
+            <field name="group" ref="group_cashbook_admin"/>
+        </record>
+        <record model="ir.model.button-res.group"
+            id="line_wfrecon_button-group_cashbook_checkline">
+            <field name="button" ref="line_wfrecon_button"/>
+            <field name="group" ref="group_cashbook_checkline"/>
+        </record>
+        <record model="ir.model.button-res.group"
+            id="line_wfrecon_button-group_cashbook_doneline">
+            <field name="button" ref="line_wfrecon_button"/>
+            <field name="group" ref="group_cashbook_doneline"/>
+        </record>
+
         <!-- button - done -->
         <record model="ir.model.button" id="line_wfdone_button">
             <field name="name">wfdone</field>

locale/de.po

@@ -70,10 +70,6 @@ msgctxt "model:ir.message,text:msg_category_type_not_like_parent"
 msgid "The type of the current category '%(catname)s' must be equal to the type of the parent category '%(parentname)s'."
 msgstr "Der Typ der aktuellen Kategorie '%(catname)s' muß gleich dem Typ der übergeordneten Kategorie '%(parentname)s' sein."
 
-msgctxt "model:ir.message,text:msg_book_err_startamount_with_lines"
-msgid "The initial amount of the cash book '%(bookname)s' cannot be changed because it already contains bookings."
-msgstr "Der Anfangsbetrag des Kassenbuchs '%(bookname)s' kann nicht geändert werden, da es bereits Buchungen enthält."
-
 msgctxt "model:ir.message,text:msg_line_deny_recon_by_state"
 msgid "For reconciliation, the line '%(recname)s' must be in the status 'Check' or 'Done'."
 msgstr "Für die Abstimmung muss die Zeile '%(recname)s' im Status 'Prüfen' oder 'Fertig' sein."
@@ -150,6 +146,14 @@ msgctxt "model:ir.message,text:msg_line_invalid_category"
 msgid "The category of the booking line '%(recname)s' does not match the posting type '%(booktype)s'."
 msgstr "Die Kategorie der Buchungszeile '%(recname)s' paßt nicht zum Buchungstyp '%(booktype)s'."
 
+msgctxt "model:ir.message,text:msg_book_btype_with_lines"
+msgid "The type cannot be deleted on the cash book '%(cbname)s' because it still contains %(numlines)s lines."
+msgstr "Der Typ kann am Kassenbuch '%(cbname)s' nicht gelöscht werden, da es noch %(numlines)s Zeilen enthält."
+
+msgctxt "model:ir.message,text:msg_book_no_type_noopen"
+msgid "The cash book '%(bookname)s' has no type and therefore cannot be opened."
+msgstr "Das Kassenbuch '%(bookname)s' hat keinen Typ und kann daher nicht geöffnet werden."
+
 
 #############
 # res.group #
@@ -258,6 +262,10 @@ msgctxt "model:ir.ui.menu,name:menu_booklist"
 msgid "Cashbook"
 msgstr "Kassenbuch"
 
+msgctxt "model:ir.ui.menu,name:menu_booktree"
+msgid "Cashbook"
+msgstr "Kassenbuch"
+
 msgctxt "model:ir.ui.menu,name:menu_open_lines"
 msgid "Open Cashbook"
 msgstr "Kassenbuch öffnen"
@@ -274,6 +282,10 @@ msgctxt "model:ir.ui.menu,name:act_category_view"
 msgid "Category"
 msgstr "Kategorie"
 
+msgctxt "model:ir.ui.menu,name:menu_enter_booking"
+msgid "Enter Booking"
+msgstr "Buchung eingeben"
+
 
 #############
 # ir.action #
@@ -282,11 +294,15 @@ msgctxt "model:ir.action,name:act_book_view"
 msgid "Cashbook"
 msgstr "Kassenbuch"
 
+msgctxt "model:ir.action,name:act_book_tree"
+msgid "Cashbook"
+msgstr "Kassenbuch"
+
 msgctxt "model:ir.action,name:act_type_view"
 msgid "Cashbook Type"
 msgstr "Kassenbuchtyp"
 
-msgctxt "model:ir.action,name:act_line_view"
+msgctxt "model:ir.action,name:act_line_view2"
 msgid "Cashbook Line"
 msgstr "Kassenbuchzeile"
 
@@ -294,6 +310,10 @@ msgctxt "model:ir.action,name:act_open_lines"
 msgid "Open Cashbook"
 msgstr "Kassenbuch öffnen"
 
+msgctxt "model:ir.action,name:act_open_tree_lines"
+msgid "Open Cashbook"
+msgstr "Kassenbuch öffnen"
+
 msgctxt "model:ir.action,name:report_cashbook"
 msgid "Cashbook"
 msgstr "Kassenbuch"
@@ -302,6 +322,10 @@ msgctxt "model:ir.action,name:act_wizard_report"
 msgid "Cashbook Report"
 msgstr "Kassenbuch Bericht"
 
+msgctxt "model:ir.action,name:act_enterbooking_wiz"
+msgid "Enter Booking"
+msgstr "Buchung eingeben"
+
 
 ###############################
 # ir.action.act_window.domain #
@@ -318,6 +342,22 @@ msgctxt "model:ir.action.act_window.domain,name:act_line_domain_all"
 msgid "All"
 msgstr "Alle"
 
+msgctxt "model:ir.action.act_window.domain,name:act_category_tree_domain_in"
+msgid "Revenue"
+msgstr "Einnahmen"
+
+msgctxt "model:ir.action.act_window.domain,name:act_category_tree_domain_out"
+msgid "Expense"
+msgstr "Ausgaben"
+
+msgctxt "model:ir.action.act_window.domain,name:act_category_list_domain_in"
+msgid "Revenue"
+msgstr "Einnahmen"
+
+msgctxt "model:ir.action.act_window.domain,name:act_category_list_domain_out"
+msgid "Expense"
+msgstr "Ausgaben"
+
 
 ###################
 # ir.model.button #
@@ -330,6 +370,10 @@ msgctxt "model:ir.model.button,string:line_wfcheck_button"
 msgid "Check"
 msgstr "Prüfen"
 
+msgctxt "model:ir.model.button,string:line_wfrecon_button"
+msgid "Reconciled"
+msgstr "Abgeglichen"
+
 msgctxt "model:ir.model.button,string:line_wfdone_button"
 msgid "Done"
 msgstr "Fertig"
@@ -390,18 +434,42 @@ msgctxt "view:cashbook.book:"
 msgid "Owner and Authorizeds"
 msgstr "Eigentümer und Autorisierte"
 
+msgctxt "view:cashbook.book:"
+msgid "General Information"
+msgstr "Allgemein"
+
+msgctxt "view:cashbook.book:"
+msgid "Amount and Numbering"
+msgstr "Betrag und Nummerierung"
+
+msgctxt "view:cashbook.book:"
+msgid "Balance"
+msgstr "Saldo"
+
 msgctxt "view:cashbook.book:"
 msgid "Reconciliations"
 msgstr "Abstimmungen"
 
+msgctxt "view:cashbook.book:"
+msgid "Description"
+msgstr "Beschreibung"
+
 msgctxt "field:cashbook.book,name:"
 msgid "Name"
 msgstr "Name"
 
+msgctxt "field:cashbook.book,description:"
+msgid "Description"
+msgstr "Beschreibung"
+
 msgctxt "field:cashbook.book,btype:"
 msgid "Type"
 msgstr "Typ"
 
+msgctxt "help:cashbook.book,btype:"
+msgid "A cash book with type can contain postings. Without type is a view."
+msgstr "Ein Kassenbuch mit Typ kann Buchungen enthalten. Ohne Typ ist eine Sicht."
+
 msgctxt "field:cashbook.book,state:"
 msgid "State"
 msgstr "Status"
@@ -446,9 +514,9 @@ msgctxt "field:cashbook.book,currency:"
 msgid "Currency"
 msgstr "Währung"
 
-msgctxt "field:cashbook.book,start_balance:"
-msgid "Initial Amount"
-msgstr "Anfangsbetrag"
+msgctxt "field:cashbook.book,currency_digits:"
+msgid "Currency Digits"
+msgstr "Nachkommastellen Währung"
 
 msgctxt "field:cashbook.book,start_date:"
 msgid "Initial Date"
@@ -458,6 +526,18 @@ msgctxt "field:cashbook.book,balance:"
 msgid "Balance"
 msgstr "Saldo"
 
+msgctxt "help:cashbook.book,balance:"
+msgid "Balance of bookings to date"
+msgstr "Saldo der Buchungen bis zum heutigen Tag"
+
+msgctxt "field:cashbook.book,balance_all:"
+msgid "Total balance"
+msgstr "Gesamtsaldo"
+
+msgctxt "help:cashbook.book,balance_all:"
+msgid "Balance of all bookings"
+msgstr "Saldo aller Buchungen"
+
 msgctxt "field:cashbook.book,reconciliations:"
 msgid "Reconciliations"
 msgstr "Abstimmungen"
@@ -482,6 +562,38 @@ msgctxt "help:cashbook.book,number_atcheck:"
 msgid "The numbering of the lines is done in the step Check. If the check mark is inactive, this happens with Done."
 msgstr "Die Nummerierung der Zeilen wird beim Schritt 'Prüfen' erledigt. Bei inaktivem Häkchen passiert dies erst bei 'Fertig'."
 
+msgctxt "field:cashbook.book,parent:"
+msgid "Parent"
+msgstr "Übergeordnet"
+
+msgctxt "field:cashbook.book,childs:"
+msgid "Children"
+msgstr "Untergeordnet"
+
+msgctxt "field:cashbook.book,left:"
+msgid "Left"
+msgstr "Links"
+
+msgctxt "field:cashbook.book,right:"
+msgid "Right"
+msgstr "Rechts"
+
+msgctxt "field:cashbook.book,balance_ref:"
+msgid "Balance (Ref.)"
+msgstr "Saldo (Ref.)"
+
+msgctxt "help:cashbook.book,balance_ref:"
+msgid "Balance in company currency"
+msgstr "Saldo in der Unternehmenswährung"
+
+msgctxt "field:cashbook.book,company_currency:"
+msgid "Company Currency"
+msgstr "Unternehmenswährung"
+
+msgctxt "field:cashbook.book,company_currency_digits:"
+msgid "Currency Digits (Ref.)"
+msgstr "Nachkommastellen Währung (Ref.)"
+
 
 ##################
 # cashbook.split #
@@ -494,6 +606,10 @@ msgctxt "view:cashbook.split:"
 msgid "Description"
 msgstr "Beschreibung"
 
+msgctxt "view:cashbook.split:"
+msgid "Amount"
+msgstr "Betrag"
+
 msgctxt "field:cashbook.split,line:"
 msgid "Line"
 msgstr "Zeile"
@@ -562,6 +678,10 @@ msgctxt "selection:cashbook.split,state:"
 msgid "Checked"
 msgstr "Geprüft"
 
+msgctxt "selection:cashbook.split,state:"
+msgid "Reconciled"
+msgstr "Abgeglichen"
+
 msgctxt "selection:cashbook.split,state:"
 msgid "Done"
 msgstr "Fertig"
@@ -570,6 +690,66 @@ msgctxt "field:cashbook.split,state_cashbook:"
 msgid "State of Cashbook"
 msgstr "Kassenbuchstatus"
 
+msgctxt "field:cashbook.split,splittype:"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "help:cashbook.split,splittype:"
+msgid "Type of split booking line"
+msgstr "Typ der Splitbuchungszeile"
+
+msgctxt "selection:cashbook.split,splittype:"
+msgid "Category"
+msgstr "Kategorie"
+
+msgctxt "selection:cashbook.split,splittype:"
+msgid "Transfer"
+msgstr "Umbuchung"
+
+msgctxt "field:cashbook.split,target:"
+msgid "Target"
+msgstr "Ziel"
+
+msgctxt "selection:cashbook.split,target:"
+msgid "Cashbook"
+msgstr "Kassenbuch"
+
+msgctxt "selection:cashbook.split,target:"
+msgid "Category"
+msgstr "Kategorie"
+
+msgctxt "field:cashbook.split,cashbook:"
+msgid "Cashbook"
+msgstr "Kassenbuch"
+
+msgctxt "field:cashbook.split,owner_cashbook:"
+msgid "Owner"
+msgstr "Eigentümer"
+
+msgctxt "field:cashbook.split,booktransf:"
+msgid "Source/Dest"
+msgstr "Quelle/Ziel"
+
+msgctxt "field:cashbook.split,currency2nd:"
+msgid "2nd Currency"
+msgstr "Fremdwährung"
+
+msgctxt "field:cashbook.split,currency2nd_digits:"
+msgid "2nd Currency Digits"
+msgstr "Nachkommastellen Fremdwährung"
+
+msgctxt "field:cashbook.split,amount_2nd_currency:"
+msgid "Amount Second Currency"
+msgstr "Fremdwährungsbetrag"
+
+msgctxt "field:cashbook.split,rate_2nd_currency:"
+msgid "Rate"
+msgstr "Kurs"
+
+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."
+
 
 #################
 # cashbook.line #
@@ -618,6 +798,10 @@ msgctxt "field:cashbook.line,description:"
 msgid "Description"
 msgstr "Beschreibung"
 
+msgctxt "field:cashbook.line,descr_short:"
+msgid "Description"
+msgstr "Beschreibung"
+
 msgctxt "field:cashbook.line,state:"
 msgid "State"
 msgstr "Status"
@@ -630,6 +814,10 @@ msgctxt "selection:cashbook.line,state:"
 msgid "Checked"
 msgstr "Geprüft"
 
+msgctxt "selection:cashbook.line,state:"
+msgid "Reconciled"
+msgstr "Abgeglichen"
+
 msgctxt "selection:cashbook.line,state:"
 msgid "Done"
 msgstr "Fertig"
@@ -766,6 +954,26 @@ msgctxt "help:cashbook.line,splitlines:"
 msgid "Rows with different categories form the total sum of the booking"
 msgstr "Zeilen mit unterschiedlichen Kategorien bilden die Gesamtsumme der Buchung"
 
+msgctxt "field:cashbook.line,currency2nd:"
+msgid "2nd Currency"
+msgstr "Fremdwährung"
+
+msgctxt "field:cashbook.line,currency2nd_digits:"
+msgid "2nd Currency Digits"
+msgstr "Nachkommastellen Fremdwährung"
+
+msgctxt "field:cashbook.line,amount_2nd_currency:"
+msgid "Amount Second Currency"
+msgstr "Fremdwährungsbetrag"
+
+msgctxt "field:cashbook.line,rate_2nd_currency:"
+msgid "Rate"
+msgstr "Kurs"
+
+msgctxt "help:cashbook.line,rate_2nd_currency:"
+msgid "Exchange rate between the currencies of the participating cashbooks."
+msgstr "Wechselkurs zwischen der Währungen der beteiligten Kassenbücher."
+
 
 #################
 # cashbook.type #
@@ -894,6 +1102,10 @@ msgctxt "model:cashbook.open_lines,name:"
 msgid "Open Cashbook"
 msgstr "Kassenbuch öffnen"
 
+msgctxt "model:cashbook.open_lines_tree,name:"
+msgid "Open Cashbook"
+msgstr "Kassenbuch öffnen"
+
 msgctxt "wizard_button:cashbook.open_lines,askuser,end:"
 msgid "Cancel"
 msgstr "Abbruch"
@@ -934,10 +1146,18 @@ msgctxt "field:cashbook.line.context,date_from:"
 msgid "Start Date"
 msgstr "Beginndatum"
 
+msgctxt "help:cashbook.line.context,date_from:"
+msgid "Limits the date range for the displayed entries."
+msgstr "Begrenzt den Datumsbereich für  die angezeigten Einträge."
+
 msgctxt "field:cashbook.line.context,date_to:"
 msgid "End Date"
 msgstr "Endedatum"
 
+msgctxt "help:cashbook.line.context,date_to:"
+msgid "Limits the date range for the displayed entries."
+msgstr "Begrenzt den Datumsbereich für  die angezeigten Einträge."
+
 
 ##########################
 # cashbook.configuration #
@@ -946,6 +1166,10 @@ msgctxt "model:cashbook.configuration,name:"
 msgid "Configuration"
 msgstr "Konfiguration"
 
+msgctxt "view:cashbook.configuration:"
+msgid "Enter Booking Wizard"
+msgstr "Dialog: Buchung eingeben"
+
 msgctxt "view:cashbook.configuration:"
 msgid "Open Cashbook Wizard"
 msgstr "Dialog: Kassenbuch öffnen"
@@ -954,6 +1178,54 @@ msgctxt "view:cashbook.configuration:"
 msgid "Cashbook"
 msgstr "Kassenbuch"
 
+msgctxt "field:cashbook.configuration,defbook:"
+msgid "Default Cashbook"
+msgstr "Standardkassenbuch"
+
+msgctxt "help:cashbook.configuration,defbook:"
+msgid "The default cashbook is selected when you open the booking wizard."
+msgstr "Das Standardkassenbuch wird beim Öffnen des Buchungswizards ausgewählt."
+
+msgctxt "field:cashbook.configuration,book1:"
+msgid "Cashbook 1"
+msgstr "Kassenbuch 1"
+
+msgctxt "help:cashbook.configuration,book1:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration,book2:"
+msgid "Cashbook 2"
+msgstr "Kassenbuch 2"
+
+msgctxt "help:cashbook.configuration,book2:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration,book3:"
+msgid "Cashbook 3"
+msgstr "Kassenbuch 3"
+
+msgctxt "help:cashbook.configuration,book3:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration,book4:"
+msgid "Cashbook 4"
+msgstr "Kassenbuch 4"
+
+msgctxt "help:cashbook.configuration,book4:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration,book5:"
+msgid "Cashbook 5"
+msgstr "Kassenbuch 5"
+
+msgctxt "help:cashbook.configuration,book5:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
 msgctxt "field:cashbook.configuration,date_from:"
 msgid "Start Date"
 msgstr "Beginndatum"
@@ -1026,6 +1298,54 @@ msgctxt "help:cashbook.configuration_user,catnamelong:"
 msgid "Shows the long name of the category in the Category field of a cash book line."
 msgstr "Zeigt im Feld 'Kategorie' einer Kassenbuchzeile den langen Namen der Kategorie."
 
+msgctxt "field:cashbook.configuration_user,defbook:"
+msgid "Default Cashbook"
+msgstr "Standardkassenbuch"
+
+msgctxt "help:cashbook.configuration_user,defbook:"
+msgid "The default cashbook is selected when you open the booking wizard."
+msgstr "Das Standardkassenbuch wird beim Öffnen des Buchungswizards ausgewählt."
+
+msgctxt "field:cashbook.configuration_user,book1:"
+msgid "Cashbook 1"
+msgstr "Kassenbuch 1"
+
+msgctxt "help:cashbook.configuration_user,book1:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration_user,book2:"
+msgid "Cashbook 2"
+msgstr "Kassenbuch 2"
+
+msgctxt "help:cashbook.configuration_user,book2:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration_user,book3:"
+msgid "Cashbook 3"
+msgstr "Kassenbuch 3"
+
+msgctxt "help:cashbook.configuration_user,book3:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration_user,book4:"
+msgid "Cashbook 4"
+msgstr "Kassenbuch 4"
+
+msgctxt "help:cashbook.configuration_user,book4:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
+msgctxt "field:cashbook.configuration_user,book5:"
+msgid "Cashbook 5"
+msgstr "Kassenbuch 5"
+
+msgctxt "help:cashbook.configuration_user,book5:"
+msgid "Cash book available in selection dialog."
+msgstr "in Auswahldialog verfügbares Kassenbuch."
+
 
 ##################
 # cashbook.recon #
@@ -1209,3 +1529,103 @@ msgstr "Gesamt"
 msgctxt "report:cashbook.reprecon:"
 msgid "Payee"
 msgstr "Empfänger"
+
+
+###############################
+# cashbook.enterbooking.start #
+###############################
+msgctxt "model:cashbook.enterbooking.start,name:"
+msgid "Enter Booking"
+msgstr "Buchung eingeben"
+
+msgctxt "view:cashbook.enterbooking.start:"
+msgid "Description"
+msgstr "Beschreibung"
+
+msgctxt "view:cashbook.enterbooking.start:"
+msgid "Booking"
+msgstr "Buchung"
+
+msgctxt "field:cashbook.enterbooking.start,cashbook:"
+msgid "Cashbook"
+msgstr "Kassenbuch"
+
+msgctxt "field:cashbook.enterbooking.start,cashbooks:"
+msgid "Cashbooks"
+msgstr "Kassenbücher"
+
+msgctxt "field:cashbook.enterbooking.start,currency_digits:"
+msgid "Currency Digits"
+msgstr "Nachkommastellen Währung"
+
+msgctxt "field:cashbook.enterbooking.start,currency:"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:cashbook.enterbooking.start,bookingtype:"
+msgid "Type"
+msgstr "Typ"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Revenue"
+msgstr "Einnahme"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Revenue Splitbooking"
+msgstr "Einnahme Splitbuchung"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Expense"
+msgstr "Ausgabe"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Expense Splitbooking"
+msgstr "Ausgabe Splitbuchung"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Transfer from"
+msgstr "Umbuchung von"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Transfer to"
+msgstr "Umbuchung nach"
+
+msgctxt "field:cashbook.enterbooking.start,amount:"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:cashbook.enterbooking.start,owner_cashbook:"
+msgid "Owner"
+msgstr "Eigentümer"
+
+msgctxt "field:cashbook.enterbooking.start,category:"
+msgid "Category"
+msgstr "Kategorie"
+
+msgctxt "field:cashbook.enterbooking.start,booktransf:"
+msgid "Source/Dest"
+msgstr "Quelle/Ziel"
+
+msgctxt "field:cashbook.enterbooking.start,party:"
+msgid "Party"
+msgstr "Partei"
+
+
+#########################
+# cashbook.enterbooking #
+#########################
+msgctxt "model:cashbook.enterbooking,name:"
+msgid "Enter Booking"
+msgstr "Buchung eingeben"
+
+msgctxt "wizard_button:cashbook.enterbooking,start,end:"
+msgid "Cancel"
+msgstr "Abbruch"
+
+msgctxt "wizard_button:cashbook.enterbooking,start,save_:"
+msgid "Save"
+msgstr "Speichern"
+
+msgctxt "wizard_button:cashbook.enterbooking,start,savenext_:"
+msgid "Save & Next"
+msgstr "Speichern & Weiter"

locale/en.po

@@ -66,10 +66,6 @@ msgctxt "model:ir.message,text:msg_category_type_not_like_parent"
 msgid "The type of the current category '%(catname)s' must be equal to the type of the parent category '%(parentname)s'."
 msgstr "The type of the current category '%(catname)s' must be equal to the type of the parent category '%(parentname)s'."
 
-msgctxt "model:ir.message,text:msg_book_err_startamount_with_lines"
-msgid "The initial amount of the cash book '%(bookname)s' cannot be changed because it already contains bookings."
-msgstr "The initial amount of the cash book '%(bookname)s' cannot be changed because it already contains bookings."
-
 msgctxt "model:ir.message,text:msg_line_deny_recon_by_state"
 msgid "For reconciliation, the line '%(recname)s' must be in the status 'Check' or 'Done'."
 msgstr "For reconciliation, the line '%(recname)s' must be in the status 'Check' or 'Done'."
@@ -146,6 +142,14 @@ msgctxt "model:ir.message,text:msg_line_invalid_category"
 msgid "The category of the booking line '%(recname)s' does not match the posting type '%(booktype)s'."
 msgstr "The category of the booking line '%(recname)s' does not match the posting type '%(booktype)s'."
 
+msgctxt "model:ir.message,text:msg_book_btype_with_lines"
+msgid "The type cannot be deleted on the cash book '%(cbname)s' because it still contains %(numlines)s lines."
+msgstr "The type cannot be deleted on the cash book '%(cbname)s' because it still contains %(numlines)s lines."
+
+msgctxt "model:ir.message,text:msg_book_no_type_noopen"
+msgid "The cash book '%(bookname)s' has no type and therefore cannot be opened."
+msgstr "The cash book '%(bookname)s' has no type and therefore cannot be opened."
+
 msgctxt "model:res.group,name:group_cashbook"
 msgid "Cashbook"
 msgstr "Cashbook"
@@ -242,6 +246,10 @@ msgctxt "model:ir.ui.menu,name:menu_booklist"
 msgid "Cashbook"
 msgstr "Cashbook"
 
+msgctxt "model:ir.ui.menu,name:menu_booktree"
+msgid "Cashbook"
+msgstr "Cashbook"
+
 msgctxt "model:ir.ui.menu,name:menu_open_lines"
 msgid "Open Cashbook"
 msgstr "Open Cashbook"
@@ -258,15 +266,23 @@ msgctxt "model:ir.ui.menu,name:act_category_view"
 msgid "Category"
 msgstr "Category"
 
+msgctxt "model:ir.ui.menu,name:menu_enter_booking"
+msgid "Enter Booking"
+msgstr "Enter Booking"
+
 msgctxt "model:ir.action,name:act_book_view"
 msgid "Cashbook"
 msgstr "Cashbook"
 
+msgctxt "model:ir.action,name:act_book_tree"
+msgid "Cashbook"
+msgstr "Cashbook"
+
 msgctxt "model:ir.action,name:act_type_view"
 msgid "Cashbook Type"
 msgstr "Cashbook Type"
 
-msgctxt "model:ir.action,name:act_line_view"
+msgctxt "model:ir.action,name:act_line_view2"
 msgid "Cashbook Line"
 msgstr "Cashbook Line"
 
@@ -274,6 +290,10 @@ msgctxt "model:ir.action,name:act_open_lines"
 msgid "Open Cashbook"
 msgstr "Open Cashbook"
 
+msgctxt "model:ir.action,name:act_open_tree_lines"
+msgid "Open Cashbook"
+msgstr "Open Cashbook"
+
 msgctxt "model:ir.action,name:report_cashbook"
 msgid "Cashbook"
 msgstr "Cashbook"
@@ -282,6 +302,10 @@ msgctxt "model:ir.action,name:act_wizard_report"
 msgid "Cashbook Report"
 msgstr "Cashbook Report"
 
+msgctxt "model:ir.action,name:act_enterbooking_wiz"
+msgid "Enter Booking"
+msgstr "Enter Booking"
+
 msgctxt "model:ir.action.act_window.domain,name:act_line_domain_current"
 msgid "Current Month"
 msgstr "Current Month"
@@ -294,6 +318,22 @@ msgctxt "model:ir.action.act_window.domain,name:act_line_domain_all"
 msgid "All"
 msgstr "All"
 
+msgctxt "model:ir.action.act_window.domain,name:act_category_tree_domain_in"
+msgid "Revenue"
+msgstr "Revenue"
+
+msgctxt "model:ir.action.act_window.domain,name:act_category_tree_domain_out"
+msgid "Expense"
+msgstr "Expense"
+
+msgctxt "model:ir.action.act_window.domain,name:act_category_list_domain_in"
+msgid "Revenue"
+msgstr "Revenue"
+
+msgctxt "model:ir.action.act_window.domain,name:act_category_list_domain_out"
+msgid "Expense"
+msgstr "Expense"
+
 msgctxt "model:ir.model.button,string:line_wfedit_button"
 msgid "Edit"
 msgstr "Edit"
@@ -302,6 +342,10 @@ msgctxt "model:ir.model.button,string:line_wfcheck_button"
 msgid "Check"
 msgstr "Check"
 
+msgctxt "model:ir.model.button,string:line_wfrecon_button"
+msgid "Reconciled"
+msgstr "Reconciled"
+
 msgctxt "model:ir.model.button,string:line_wfdone_button"
 msgid "Done"
 msgstr "Done"
@@ -354,18 +398,42 @@ msgctxt "view:cashbook.book:"
 msgid "Owner and Authorizeds"
 msgstr "Owner and Authorizeds"
 
+msgctxt "view:cashbook.book:"
+msgid "General Information"
+msgstr "General Information"
+
+msgctxt "view:cashbook.book:"
+msgid "Amount and Numbering"
+msgstr "Amount and Numbering"
+
+msgctxt "view:cashbook.book:"
+msgid "Balance"
+msgstr "Balance"
+
 msgctxt "view:cashbook.book:"
 msgid "Reconciliations"
 msgstr "Reconciliations"
 
+msgctxt "view:cashbook.book:"
+msgid "Description"
+msgstr "Description"
+
 msgctxt "field:cashbook.book,name:"
 msgid "Name"
 msgstr "Name"
 
+msgctxt "field:cashbook.book,description:"
+msgid "Description"
+msgstr "Description"
+
 msgctxt "field:cashbook.book,btype:"
 msgid "Type"
 msgstr "Type"
 
+msgctxt "help:cashbook.book,btype:"
+msgid "A cash book with type can contain postings. Without type is a view."
+msgstr "A cash book with type can contain postings. Without type is a view."
+
 msgctxt "field:cashbook.book,state:"
 msgid "State"
 msgstr "State"
@@ -410,9 +478,9 @@ msgctxt "field:cashbook.book,currency:"
 msgid "Currency"
 msgstr "Currency"
 
-msgctxt "field:cashbook.book,start_balance:"
-msgid "Initial Amount"
-msgstr "Initial Amount"
+msgctxt "field:cashbook.book,currency_digits:"
+msgid "Currency Digits"
+msgstr "Currency Digits"
 
 msgctxt "field:cashbook.book,start_date:"
 msgid "Initial Date"
@@ -422,6 +490,18 @@ msgctxt "field:cashbook.book,balance:"
 msgid "Balance"
 msgstr "Balance"
 
+msgctxt "help:cashbook.book,balance:"
+msgid "Balance of bookings to date"
+msgstr "Balance of bookings to date"
+
+msgctxt "field:cashbook.book,balance_all:"
+msgid "Total balance"
+msgstr "Total balance"
+
+msgctxt "help:cashbook.book,balance_all:"
+msgid "Balance of all bookings"
+msgstr "Balance of all bookings"
+
 msgctxt "field:cashbook.book,reconciliations:"
 msgid "Reconciliations"
 msgstr "Reconciliations"
@@ -446,6 +526,38 @@ msgctxt "help:cashbook.book,number_atcheck:"
 msgid "The numbering of the lines is done in the step Check. If the check mark is inactive, this happens with Done."
 msgstr "The numbering of the lines is done in the step Check. If the check mark is inactive, this happens with Done."
 
+msgctxt "field:cashbook.book,parent:"
+msgid "Parent"
+msgstr "Parent"
+
+msgctxt "field:cashbook.book,childs:"
+msgid "Children"
+msgstr "Children"
+
+msgctxt "field:cashbook.book,left:"
+msgid "Left"
+msgstr "Left"
+
+msgctxt "field:cashbook.book,right:"
+msgid "Right"
+msgstr "Right"
+
+msgctxt "field:cashbook.book,balance_ref:"
+msgid "Balance (Ref.)"
+msgstr "Balance (Ref.)"
+
+msgctxt "help:cashbook.book,balance_ref:"
+msgid "Balance in company currency"
+msgstr "Balance in company currency"
+
+msgctxt "field:cashbook.book,company_currency:"
+msgid "Company Currency"
+msgstr "Company Currency"
+
+msgctxt "field:cashbook.book,company_currency_digits:"
+msgid "Currency Digits (Ref.)"
+msgstr "Currency Digits (Ref.)"
+
 msgctxt "model:cashbook.split,name:"
 msgid "Split booking line"
 msgstr "Split booking line"
@@ -454,6 +566,10 @@ msgctxt "view:cashbook.split:"
 msgid "Description"
 msgstr "Description"
 
+msgctxt "view:cashbook.split:"
+msgid "Amount"
+msgstr "Amount"
+
 msgctxt "field:cashbook.split,line:"
 msgid "Line"
 msgstr "Line"
@@ -522,6 +638,10 @@ msgctxt "selection:cashbook.split,state:"
 msgid "Checked"
 msgstr "Checked"
 
+msgctxt "selection:cashbook.split,state:"
+msgid "Reconciled"
+msgstr "Reconciled"
+
 msgctxt "selection:cashbook.split,state:"
 msgid "Done"
 msgstr "Done"
@@ -530,6 +650,66 @@ msgctxt "field:cashbook.split,state_cashbook:"
 msgid "State of Cashbook"
 msgstr "State of Cashbook"
 
+msgctxt "field:cashbook.split,splittype:"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "help:cashbook.split,splittype:"
+msgid "Type of split booking line"
+msgstr "Type of split booking line"
+
+msgctxt "selection:cashbook.split,splittype:"
+msgid "Category"
+msgstr "Category"
+
+msgctxt "selection:cashbook.split,splittype:"
+msgid "Transfer"
+msgstr "Transfer"
+
+msgctxt "field:cashbook.split,target:"
+msgid "Target"
+msgstr "Target"
+
+msgctxt "selection:cashbook.split,target:"
+msgid "Cashbook"
+msgstr "Cashbook"
+
+msgctxt "selection:cashbook.split,target:"
+msgid "Category"
+msgstr "Category"
+
+msgctxt "field:cashbook.split,cashbook:"
+msgid "Cashbook"
+msgstr "Cashbook"
+
+msgctxt "field:cashbook.split,owner_cashbook:"
+msgid "Owner"
+msgstr "Owner"
+
+msgctxt "field:cashbook.split,booktransf:"
+msgid "Source/Dest"
+msgstr "Source/Dest"
+
+msgctxt "field:cashbook.split,currency2nd:"
+msgid "2nd Currency"
+msgstr "2nd Currency"
+
+msgctxt "field:cashbook.split,currency2nd_digits:"
+msgid "2nd Currency Digits"
+msgstr "2nd Currency Digits"
+
+msgctxt "field:cashbook.split,amount_2nd_currency:"
+msgid "Amount Second Currency"
+msgstr "Amount Second Currency"
+
+msgctxt "field:cashbook.split,rate_2nd_currency:"
+msgid "Rate"
+msgstr "Rate"
+
+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 "model:cashbook.line,name:"
 msgid "Cashbook Line"
 msgstr "Cashbook Line"
@@ -574,6 +754,10 @@ msgctxt "field:cashbook.line,description:"
 msgid "Description"
 msgstr "Description"
 
+msgctxt "field:cashbook.line,descr_short:"
+msgid "Description"
+msgstr "Description"
+
 msgctxt "field:cashbook.line,state:"
 msgid "State"
 msgstr "State"
@@ -586,6 +770,10 @@ msgctxt "selection:cashbook.line,state:"
 msgid "Checked"
 msgstr "Checked"
 
+msgctxt "selection:cashbook.line,state:"
+msgid "Reconciled"
+msgstr "Reconciled"
+
 msgctxt "selection:cashbook.line,state:"
 msgid "Done"
 msgstr "Done"
@@ -722,6 +910,26 @@ msgctxt "help:cashbook.line,splitlines:"
 msgid "Rows with different categories form the total sum of the booking"
 msgstr "Rows with different categories form the total sum of the booking"
 
+msgctxt "field:cashbook.line,currency2nd:"
+msgid "2nd Currency"
+msgstr "2nd Currency"
+
+msgctxt "field:cashbook.line,currency2nd_digits:"
+msgid "2nd Currency Digits"
+msgstr "2nd Currency Digits"
+
+msgctxt "field:cashbook.line,amount_2nd_currency:"
+msgid "Amount Second Currency"
+msgstr "Amount Second Currency"
+
+msgctxt "field:cashbook.line,rate_2nd_currency:"
+msgid "Rate"
+msgstr "Rate"
+
+msgctxt "help:cashbook.line,rate_2nd_currency:"
+msgid "Exchange rate between the currencies of the participating cashbooks."
+msgstr "Exchange rate between the currencies of the participating cashbooks."
+
 msgctxt "model:cashbook.type,name:"
 msgid "Cashbook Type"
 msgstr "Cashbook Type"
@@ -834,6 +1042,10 @@ msgctxt "model:cashbook.open_lines,name:"
 msgid "Open Cashbook"
 msgstr "Open Cashbook"
 
+msgctxt "model:cashbook.open_lines_tree,name:"
+msgid "Open Cashbook"
+msgstr "Open Cashbook"
+
 msgctxt "wizard_button:cashbook.open_lines,askuser,end:"
 msgid "Cancel"
 msgstr "Cancel"
@@ -870,14 +1082,26 @@ msgctxt "field:cashbook.line.context,date_from:"
 msgid "Start Date"
 msgstr "Start Date"
 
+msgctxt "help:cashbook.line.context,date_from:"
+msgid "Limits the date range for the displayed entries."
+msgstr "Limits the date range for the displayed entries."
+
 msgctxt "field:cashbook.line.context,date_to:"
 msgid "End Date"
 msgstr "End Date"
 
+msgctxt "help:cashbook.line.context,date_to:"
+msgid "Limits the date range for the displayed entries."
+msgstr "Limits the date range for the displayed entries."
+
 msgctxt "model:cashbook.configuration,name:"
 msgid "Configuration"
 msgstr "Configuration"
 
+msgctxt "view:cashbook.configuration:"
+msgid "Enter Booking Wizard"
+msgstr "Enter Booking Wizard"
+
 msgctxt "view:cashbook.configuration:"
 msgid "Open Cashbook Wizard"
 msgstr "Open Cashbook Wizard"
@@ -886,6 +1110,54 @@ msgctxt "view:cashbook.configuration:"
 msgid "Cashbook"
 msgstr "Cashbook"
 
+msgctxt "field:cashbook.configuration,defbook:"
+msgid "Default Cashbook"
+msgstr "Default Cashbook"
+
+msgctxt "help:cashbook.configuration,defbook:"
+msgid "The default cashbook is selected when you open the booking wizard."
+msgstr "The default cashbook is selected when you open the booking wizard."
+
+msgctxt "field:cashbook.configuration,book1:"
+msgid "Cashbook 1"
+msgstr "Cashbook 1"
+
+msgctxt "help:cashbook.configuration,book1:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration,book2:"
+msgid "Cashbook 2"
+msgstr "Cashbook 2"
+
+msgctxt "help:cashbook.configuration,book2:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration,book3:"
+msgid "Cashbook 3"
+msgstr "Cashbook 3"
+
+msgctxt "help:cashbook.configuration,book3:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration,book4:"
+msgid "Cashbook 4"
+msgstr "Cashbook 4"
+
+msgctxt "help:cashbook.configuration,book4:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration,book5:"
+msgid "Cashbook 5"
+msgstr "Cashbook 5"
+
+msgctxt "help:cashbook.configuration,book5:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
 msgctxt "field:cashbook.configuration,date_from:"
 msgid "Start Date"
 msgstr "Start Date"
@@ -954,6 +1226,54 @@ msgctxt "help:cashbook.configuration_user,catnamelong:"
 msgid "Shows the long name of the category in the Category field of a cash book line."
 msgstr "Shows the long name of the category in the Category field of a cash book line."
 
+msgctxt "field:cashbook.configuration_user,defbook:"
+msgid "Default Cashbook"
+msgstr "Default Cashbook"
+
+msgctxt "help:cashbook.configuration_user,defbook:"
+msgid "The default cashbook is selected when you open the booking wizard."
+msgstr "The default cashbook is selected when you open the booking wizard."
+
+msgctxt "field:cashbook.configuration_user,book1:"
+msgid "Cashbook 1"
+msgstr "Cashbook 1"
+
+msgctxt "help:cashbook.configuration_user,book1:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration_user,book2:"
+msgid "Cashbook 2"
+msgstr "Cashbook 2"
+
+msgctxt "help:cashbook.configuration_user,book2:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration_user,book3:"
+msgid "Cashbook 3"
+msgstr "Cashbook 3"
+
+msgctxt "help:cashbook.configuration_user,book3:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration_user,book4:"
+msgid "Cashbook 4"
+msgstr "Cashbook 4"
+
+msgctxt "help:cashbook.configuration_user,book4:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
+msgctxt "field:cashbook.configuration_user,book5:"
+msgid "Cashbook 5"
+msgstr "Cashbook 5"
+
+msgctxt "help:cashbook.configuration_user,book5:"
+msgid "Cash book available in selection dialog."
+msgstr "Cash book available in selection dialog."
+
 msgctxt "model:cashbook.recon,name:"
 msgid "Cashbook Reconciliation"
 msgstr "Cashbook Reconciliation"
@@ -1122,3 +1442,95 @@ msgctxt "report:cashbook.reprecon:"
 msgid "Total"
 msgstr "Total"
 
+msgctxt "report:cashbook.reprecon:"
+msgid "Payee"
+msgstr "Payee"
+
+msgctxt "model:cashbook.enterbooking.start,name:"
+msgid "Enter Booking"
+msgstr "Enter Booking"
+
+msgctxt "view:cashbook.enterbooking.start:"
+msgid "Description"
+msgstr "Description"
+
+msgctxt "view:cashbook.enterbooking.start:"
+msgid "Booking"
+msgstr "Booking"
+
+msgctxt "field:cashbook.enterbooking.start,cashbook:"
+msgid "Cashbook"
+msgstr "Cashbook"
+
+msgctxt "field:cashbook.enterbooking.start,cashbooks:"
+msgid "Cashbooks"
+msgstr "Cashbooks"
+
+msgctxt "field:cashbook.enterbooking.start,currency_digits:"
+msgid "Currency Digits"
+msgstr "Currency Digits"
+
+msgctxt "field:cashbook.enterbooking.start,currency:"
+msgid "Currency"
+msgstr "Currency"
+
+msgctxt "field:cashbook.enterbooking.start,bookingtype:"
+msgid "Type"
+msgstr "Type"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Revenue"
+msgstr "Revenue"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Revenue Splitbooking"
+msgstr "Revenue Splitbooking"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Expense"
+msgstr "Expense"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Expense Splitbooking"
+msgstr "Expense Splitbooking"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Transfer from"
+msgstr "Transfer from"
+
+msgctxt "selection:cashbook.enterbooking.start,bookingtype:"
+msgid "Transfer to"
+msgstr "Transfer to"
+
+msgctxt "field:cashbook.enterbooking.start,amount:"
+msgid "Amount"
+msgstr "Amount"
+
+msgctxt "field:cashbook.enterbooking.start,owner_cashbook:"
+msgid "Owner"
+msgstr "Owner"
+
+msgctxt "field:cashbook.enterbooking.start,category:"
+msgid "Category"
+msgstr "Category"
+
+msgctxt "field:cashbook.enterbooking.start,booktransf:"
+msgid "Source/Dest"
+msgstr "Source/Dest"
+
+msgctxt "field:cashbook.enterbooking.start,party:"
+msgid "Party"
+msgstr "Party"
+
+msgctxt "model:cashbook.enterbooking,name:"
+msgid "Enter Booking"
+msgstr "Enter Booking"
+
+msgctxt "wizard_button:cashbook.enterbooking,start,end:"
+msgid "Cancel"
+msgstr "Cancel"
+
+msgctxt "wizard_button:cashbook.enterbooking,start,save_:"
+msgid "Save"
+msgstr "Save"
+

menu.xml

@@ -56,10 +56,23 @@ full copyright notices and license terms. -->
             <field name="group" ref="group_cashbook_admin"/>
         </record>
 
+        <!-- menu: /Cashbook/Enter Booking -->
+        <menuitem id="menu_enter_booking" action="act_enterbooking_wiz"
+            icon="tryton-add"
+            parent="menu_cashbook" sequence="20"/>
+        <record model="ir.ui.menu-res.group" id="menu_enter_booking-group_cashbook">
+            <field name="menu" ref="menu_enter_booking"/>
+            <field name="group" ref="group_cashbook"/>
+        </record>
+        <record model="ir.ui.menu-res.group" id="menu_enter_booking-group_cashbook_admin">
+            <field name="menu" ref="menu_enter_booking"/>
+            <field name="group" ref="group_cashbook_admin"/>
+        </record>
+
         <!-- menu: /Cashbook/Open Cashbook -->
         <menuitem id="menu_open_lines" action="act_open_lines"
             icon="tryton-list"
-            parent="menu_cashbook" sequence="20"/>
+            parent="menu_cashbook" sequence="30"/>
         <record model="ir.ui.menu-res.group" id="menu_open_lines-group_cashbook">
             <field name="menu" ref="menu_open_lines"/>
             <field name="group" ref="group_cashbook"/>
@@ -70,9 +83,21 @@ full copyright notices and license terms. -->
         </record>
 
         <!-- menu: /Cashbook/Cashbook -->
+        <menuitem id="menu_booktree" action="act_book_tree"
+            icon="tryton-tree"
+            parent="menu_cashbook" sequence="40"/>
+        <record model="ir.ui.menu-res.group" id="menu_booktree-group_cashbook">
+            <field name="menu" ref="menu_booktree"/>
+            <field name="group" ref="group_cashbook"/>
+        </record>
+        <record model="ir.ui.menu-res.group" id="menu_booktree-group_cashbook_admin">
+            <field name="menu" ref="menu_booktree"/>
+            <field name="group" ref="group_cashbook_admin"/>
+        </record>
+        <!-- menu: /Cashbook/Cashbook/Cashbook -->
         <menuitem id="menu_booklist" action="act_book_view"
             icon="tryton-list"
-            parent="menu_cashbook" sequence="30"/>
+            parent="menu_booktree" sequence="10"/>
         <record model="ir.ui.menu-res.group" id="menu_booklist-group_cashbook">
             <field name="menu" ref="menu_booklist"/>
             <field name="group" ref="group_cashbook"/>

message.xml

@@ -53,9 +53,6 @@ full copyright notices and license terms. -->
         <record model="ir.message" id="msg_category_type_not_like_parent">
             <field name="text">The type of the current category '%(catname)s' must be equal to the type of the parent category '%(parentname)s'.</field>
         </record>
-        <record model="ir.message" id="msg_book_err_startamount_with_lines">
-            <field name="text">The initial amount of the cash book '%(bookname)s' cannot be changed because it already contains bookings.</field>
-        </record>
         <record model="ir.message" id="msg_line_deny_recon_by_state">
             <field name="text">For reconciliation, the line '%(recname)s' must be in the status 'Check' or 'Done'.</field>
         </record>
@@ -113,6 +110,12 @@ full copyright notices and license terms. -->
         <record model="ir.message" id="msg_line_invalid_category">
             <field name="text">The category of the booking line '%(recname)s' does not match the posting type '%(booktype)s'.</field>
         </record>
+        <record model="ir.message" id="msg_book_btype_with_lines">
+            <field name="text">The type cannot be deleted on the cash book '%(cbname)s' because it still contains %(numlines)s lines.</field>
+        </record>
+        <record model="ir.message" id="msg_book_no_type_noopen">
+            <field name="text">The cash book '%(bookname)s' has no type and therefore cannot be opened.</field>
+        </record>
 
     </data>
 </tryton>

mixin.py

@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+# This file is part of the cashbook-module from m-ds 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, ModelSQL, fields
+from trytond.pyson import Eval, Bool, Or
+from trytond.pool import Pool
+from trytond.modules.currency.ir import rate_decimal
+from trytond.transaction import Transaction
+from decimal import Decimal
+
+STATES = {
+    'readonly': Or(
+            Eval('state', '') != 'edit',
+            Eval('state_cashbook', '') != 'open',
+        ),
+    }
+DEPENDS=['state', 'state_cashbook']
+
+
+class SecondCurrencyMixin:
+    """ two fields for 2nd currency: amount + rate
+    """
+    amount_2nd_currency = fields.Numeric(string='Amount Second Currency',
+        digits=(16, Eval('currency2nd_digits', 2)),
+        states={
+            'readonly': Or(
+                    STATES['readonly'],
+                    ~Bool(Eval('currency2nd'))
+                ),
+            'required': Bool(Eval('currency2nd')),
+            'invisible': ~Bool(Eval('currency2nd')),
+        }, depends=DEPENDS+['currency2nd_digits', 'currency2nd'])
+    rate_2nd_currency = fields.Function(fields.Numeric(string='Rate',
+        help='Exchange rate between the currencies of the participating cashbooks.',
+        digits=(rate_decimal * 2, rate_decimal),
+        states={
+            'readonly': Or(
+                    STATES['readonly'],
+                    ~Bool(Eval('currency2nd'))
+                ),
+            'required': Bool(Eval('currency2nd')),
+            'invisible': ~Bool(Eval('currency2nd')),
+        }, depends=DEPENDS+['currency2nd_digits', 'currency2nd']),
+        'on_change_with_rate_2nd_currency', setter='set_rate_2nd_currency')
+
+    currency2nd = fields.Function(fields.Many2One(model_name='currency.currency',
+        string="2nd Currency", readonly=True), 'on_change_with_currency2nd')
+    currency2nd_digits = fields.Function(fields.Integer(string='2nd Currency Digits',
+        readonly=True), 'on_change_with_currency2nd_digits')
+
+    @classmethod
+    def add_2nd_currency(cls, values, from_currency):
+        """ add second currency amount if missing
+        """
+        pool = Pool()
+        Currency = pool.get('currency.currency')
+        Cashbook = pool.get('cashbook.book')
+        IrDate = pool.get('ir.date')
+
+        #cashbook = values.get('cashbook', None)
+        booktransf = values.get('booktransf', None)
+        amount = values.get('amount', None)
+        amount_2nd_currency = values.get('amount_2nd_currency', None)
+
+        if (amount is not None) and (booktransf is not None):
+            if amount_2nd_currency is None:
+                #cashbook = Cashbook(cashbook)
+                booktransf = Cashbook(booktransf)
+                if from_currency.id != booktransf.currency.id:
+                    with Transaction().set_context({
+                        'date': values.get('date', IrDate.today()),
+                        }):
+                        values['amount_2nd_currency'] = Currency.compute(
+                            from_currency,
+                            amount,
+                            booktransf.currency,
+                            )
+        return values
+
+    @fields.depends('booktransf', '_parent_booktransf.currency', \
+        'currency', 'amount', 'date', 'amount_2nd_currency', 'rate_2nd_currency')
+    def on_change_booktransf(self):
+        """ update amount_2nd_currency
+        """
+        self.on_change_rate_2nd_currency()
+
+    @fields.depends('booktransf', '_parent_booktransf.currency', \
+        'currency', 'amount', 'date', 'amount_2nd_currency', 'rate_2nd_currency')
+    def on_change_amount(self):
+        """ update amount_2nd_currency
+        """
+        self.on_change_rate_2nd_currency()
+
+    @fields.depends('booktransf', '_parent_booktransf.currency', \
+        'currency', 'amount', 'date', 'amount_2nd_currency', 'rate_2nd_currency')
+    def on_change_rate_2nd_currency(self):
+        """ update amount_2nd_currency + rate_2nd_currency
+        """
+        pool = Pool()
+        IrDate = pool.get('ir.date')
+        Currency = pool.get('currency.currency')
+
+        if (self.amount is None) or (self.booktransf is None):
+            self.amount_2nd_currency = None
+            self.rate_2nd_currency = None
+            return
+
+        if self.rate_2nd_currency is None:
+            # no rate set, use current rate of target-currency
+            with Transaction().set_context({
+                'date': self.date or IrDate.today(),
+                }):
+                self.amount_2nd_currency = Currency.compute(
+                    self.currency,
+                    self.amount,
+                    self.booktransf.currency
+                    )
+                if self.amount != Decimal('0.0'):
+                    self.rate_2nd_currency = self.amount_2nd_currency / self.amount
+        else :
+            self.amount_2nd_currency = self.booktransf.currency.round(
+                    self.amount * self.rate_2nd_currency
+                )
+
+    @classmethod
+    def set_rate_2nd_currency(cls, lines, name, value):
+        """ compute amount_2nd_currency, write to db
+        """
+        Line2 = Pool().get(cls.__name__)
+
+        to_write = []
+
+        if not name == 'rate_2nd_currency':
+            return
+
+        for line in lines:
+            if line.booktransf is None:
+                continue
+
+            if line.cashbook.currency.id == line.booktransf.currency.id:
+                continue
+
+            to_write.extend([
+                [line],
+                {
+                    'amount_2nd_currency': line.booktransf.currency.round(
+                        line.amount * value),
+                }])
+
+        if len(to_write) > 0:
+            Line2.write(*to_write)
+
+    @fields.depends('amount', 'amount_2nd_currency', 'rate_2nd_currency')
+    def on_change_amount_2nd_currency(self):
+        """ update rate_2nd_currency by rate
+        """
+        self.rate_2nd_currency = self.on_change_with_rate_2nd_currency()
+
+    @fields.depends('amount', 'amount_2nd_currency')
+    def on_change_with_rate_2nd_currency(self, name=None):
+        """ get current rate from amount
+        """
+        Rate =  Pool().get('currency.currency.rate')
+
+        if (self.amount is not None) and \
+            (self.amount_2nd_currency is not None):
+            if self.amount != Decimal('0.0'):
+                exp = Decimal(Decimal(1) / 10 ** Rate.rate.digits[1])
+                return (self.amount_2nd_currency / self.amount).quantize(exp)
+
+    @fields.depends('currency', 'booktransf', '_parent_booktransf.currency')
+    def on_change_with_currency2nd(self, name=None):
+        """ currency of transfer-target
+        """
+        if self.booktransf:
+            if self.currency:
+                if self.currency.id != self.booktransf.currency.id:
+                    return self.booktransf.currency.id
+
+    @fields.depends('currency', 'booktransf', '_parent_booktransf.currency')
+    def on_change_with_currency2nd_digits(self, name=None):
+        """ currency of transfer-target
+        """
+        if self.booktransf:
+            return self.booktransf.currency.digits
+        else:
+            return 2
+
+# end SecondCurrencyMixin

model.py

@@ -5,6 +5,68 @@
 
 from trytond.model import MultiValueMixin, ValueMixin, fields, Unique
 from trytond.transaction import Transaction
+from trytond.pool import Pool
+from sql import With, Literal
+from sql.functions import Function
+
+
+class ArrayApppend(Function):
+    """ sql: array_append
+    """
+    __slots__ = ()
+    _function = 'ARRAY_APPEND'
+
+# end ArrayApppend
+
+
+class ArrayToString(Function):
+    """ sql: array_to_string
+    """
+    __slots__ = ()
+    _function = 'ARRAY_TO_STRING'
+
+# end ArrayToString
+
+
+class Array(Function):
+    """ sql: array-type
+    """
+    __slots__ = ()
+    _function = 'ARRAY'
+
+    def __str__(self):
+        return self._function + '[' + ', '.join(
+            map(self._format, self.args)) + ']'
+
+# end Array
+
+
+def order_name_hierarchical(model_name, tables):
+    """ order by pos
+        a recursive sorting
+    """
+    Model2 = Pool().get(model_name)
+    tab_mod = Model2.__table__()
+    tab_mod2 = Model2.__table__()
+    table, _ = tables[None]
+
+    lines = With('id', 'name', 'name_path', recursive=True)
+    lines.query = tab_mod.select(
+            tab_mod.id, tab_mod.name, Array(tab_mod.name),
+            where = tab_mod.parent==None,
+        )
+    lines.query |= tab_mod2.join(lines,
+            condition=lines.id==tab_mod2.parent,
+        ).select(
+            tab_mod2.id, tab_mod2.name, ArrayApppend(lines.name_path, tab_mod2.name),
+        )
+    lines.query.all_ = True
+
+    query = lines.select(
+            ArrayToString(lines.name_path, '/').as_('rec_name'),
+            where = table.id==lines.id,
+            with_ = [lines])
+    return [query]
 
 
 class UserValueMixin(ValueMixin):

reconciliation.py

@@ -69,7 +69,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
         depends=DEPENDS+['date_from', 'date_to', 'cashbook'],
         add_remove=[
             ('cashbook', '=', Eval('cashbook')),
-            ('state', 'in', ['check', 'done']),
+            ('state', 'in', ['check', 'recon', 'done']),
             ('date', '>=', Eval('date_from')),
             ('date', '<=', Eval('date_to')),
         ],
@@ -96,7 +96,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
     @classmethod
     def __setup__(cls):
         super(Reconciliation, cls).__setup__()
-        cls._order.insert(0, ('date_from', 'ASC'))
+        cls._order.insert(0, ('date_from', 'DESC'))
         cls._transitions |= set((
                 ('edit', 'check'),
                 ('check', 'done'),
@@ -156,7 +156,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
                 ('date', '>', reconciliation.date_from),
                 ('date', '<', reconciliation.date_to),
                 ('cashbook.id', '=', reconciliation.cashbook.id),
-                ('state', '!=', 'check'),
+                ('state', 'not in', ['check', 'recon']),
                 ]) > 0:
                 raise UserError(gettext(
                     'cashbook.mds_recon_deny_line_not_check',
@@ -226,7 +226,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
                         ))
                 values['start_amount'] = reconciliation.predecessor.end_amount
             else :
-                values['start_amount'] = reconciliation.cashbook.start_balance
+                values['start_amount'] = Decimal('0.0')
             values['end_amount'] = values['start_amount']
 
             # add 'checked'-lines to reconciliation
@@ -235,7 +235,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
                 ('date', '<=', reconciliation.date_to),
                 ('cashbook.id', '=', reconciliation.cashbook.id),
                 ('reconciliation', '=', None),
-                ('state', '=', 'check'),
+                ('state', 'in', ['check', 'recon']),
                 ])
             if len(lines) > 0:
                 values['lines'] = [('add', [x.id for x in lines])]
@@ -259,8 +259,16 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
         Line = Pool().get('cashbook.line')
 
         to_wfdone_line = []
+        to_wfrecon_line = []
         for reconciliation in reconciliations:
-            to_wfdone_line.extend(list(reconciliation.lines))
+            to_wfrecon_line.extend([
+                    x for x in reconciliation.lines \
+                        if x.state == 'check'
+                ])
+            to_wfdone_line.extend([
+                    x for x in reconciliation.lines \
+                        if x.state == 'recon'
+                ])
 
             # deny if there are lines not linked to reconciliation
             if Line.search_count([
@@ -281,6 +289,9 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
                     date_to = Report.format_date(reconciliation.date_to),
                     ))
 
+        if len(to_wfrecon_line) > 0:
+            Line.wfrecon(to_wfrecon_line)
+            to_wfdone_line.extend(to_wfrecon_line)
         if len(to_wfdone_line) > 0:
             Line.wfdone(to_wfdone_line)
 
@@ -446,6 +457,6 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
                     reconstate = reconciliation.state_string,
                     ))
 
-        return super(Reconciliation, cls).delete(reconciliations)
+        super(Reconciliation, cls).delete(reconciliations)
 
 # end Type

splitline.py

@@ -12,9 +12,21 @@ from trytond.i18n import gettext
 from trytond.transaction import Transaction
 from .line import sel_linetype, sel_bookingtype, STATES, DEPENDS
 from .book import sel_state_book
+from .mixin import SecondCurrencyMixin
 
 
-class SplitLine(ModelSQL, ModelView):
+sel_linetype = [
+    ('cat', 'Category'),
+    ('tr', 'Transfer'),
+    ]
+
+sel_target = [
+    ('cashbook.book', 'Cashbook'),
+    ('cashbook.category', 'Category'),
+    ]
+
+
+class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
     'Split booking line'
     __name__ = 'cashbook.split'
 
@@ -23,9 +35,16 @@ class SplitLine(ModelSQL, ModelView):
         readonly=True)
     description = fields.Text(string='Description',
         states=STATES, depends=DEPENDS)
+    splittype = fields.Selection(string='Type', required=True,
+        help='Type of split booking line', selection=sel_linetype,
+        states=STATES, depends=DEPENDS)
     category = fields.Many2One(string='Category',
         model_name='cashbook.category', ondelete='RESTRICT',
-        states=STATES, depends=DEPENDS+['bookingtype'], required=True,
+        states={
+            'readonly': STATES['readonly'],
+            'required': Eval('splittype', '') == 'cat',
+            'invisible': Eval('splittype', '') != 'cat',
+        }, depends=DEPENDS+['bookingtype', 'splittype'],
         domain=[
             If(
                 Eval('bookingtype', '') == 'spin',
@@ -34,9 +53,26 @@ class SplitLine(ModelSQL, ModelView):
             )])
     category_view = fields.Function(fields.Char(string='Category', readonly=True),
         'on_change_with_category_view')
+    booktransf = fields.Many2One(string='Source/Dest',
+        ondelete='RESTRICT', model_name='cashbook.book',
+        domain=[
+            ('owner.id', '=', Eval('owner_cashbook', -1)),
+            ('id', '!=', Eval('cashbook', -1)),
+            ('btype', '!=', None),
+            ],
+        states={
+            'readonly': STATES['readonly'],
+            'invisible': Eval('splittype', '') != 'tr',
+            'required': Eval('splittype', '') == 'tr',
+        }, depends=DEPENDS+['bookingtype', 'owner_cashbook', 'cashbook'])
+
     amount = fields.Numeric(string='Amount', digits=(16, Eval('currency_digits', 2)),
         required=True, states=STATES, depends=DEPENDS+['currency_digits'])
 
+    date = fields.Function(fields.Date(string='Date', readonly=True),
+        'on_change_with_date')
+    target = fields.Function(fields.Reference(string='Target', readonly=True,
+        selection=sel_target), 'on_change_with_target')
     currency = fields.Function(fields.Many2One(model_name='currency.currency',
         string="Currency", readonly=True), 'on_change_with_currency')
     currency_digits = fields.Function(fields.Integer(string='Currency Digits',
@@ -45,40 +81,62 @@ class SplitLine(ModelSQL, ModelView):
         selection=sel_bookingtype), 'on_change_with_bookingtype')
     state = fields.Function(fields.Selection(string='State', readonly=True,
         selection=sel_linetype), 'on_change_with_state')
+    cashbook = fields.Function(fields.Many2One(string='Cashbook',
+        readonly=True, states={'invisible': True}, model_name='cashbook.book'),
+        'on_change_with_cashbook')
     state_cashbook = fields.Function(fields.Selection(string='State of Cashbook',
         readonly=True, states={'invisible': True}, selection=sel_state_book),
         'on_change_with_state_cashbook')
+    owner_cashbook = fields.Function(fields.Many2One(string='Owner', readonly=True,
+        states={'invisible': True}, model_name='res.user'),
+        'on_change_with_owner_cashbook')
+
+    @classmethod
+    def default_splittype(cls):
+        """ default category
+        """
+        return 'cat'
 
     def get_rec_name(self, name):
         """ short + name
         """
-        return '%(type)s|%(amount)s %(symbol)s|%(desc)s [%(category)s]' % {
+        return '%(type)s|%(amount)s %(symbol)s|%(desc)s [%(target)s]' % {
             'desc': (self.description or '-')[:40],
             'amount': Report.format_number(self.amount, None),
             'symbol': getattr(self.currency, 'symbol', '-'),
-            'category': self.category_view,
+            'target': self.category_view if self.splittype == 'cat' else self.booktransf.rec_name,
             'type': gettext('cashbook.msg_line_bookingtype_%s' % self.line.bookingtype),
             }
 
-    def get_amount_by_second_currency(self, to_currency):
-        """ get amount, calculate credit/debit from currency of current
-            cashbook to 'to_currency'
+    @fields.depends('splittype', 'category', 'booktransf')
+    def on_change_splittype(self):
+        """ clear category if not valid type
         """
-        Currency = Pool().get('currency.currency')
+        if self.splittype:
+            if self.splittype == 'cat':
+                self.booktransf = None
+            if self.splittype == 'tr':
+                self.category = None
 
-        values = {
-            'amount': self.amount,
-            }
+    @fields.depends('line', '_parent_line.date')
+    def on_change_with_date(self, name=None):
+        """ get date of line
+        """
+        if self.line:
+            if self.line.date is not None:
+                return self.line.date
 
-        if to_currency.id != self.line.cashbook.currency.id:
-            with Transaction().set_context({
-                'date': self.line.date,
-                }):
-                values['amount'] = Currency.compute(
-                        self.line.cashbook.currency,
-                        self.amount,
-                        to_currency)
-        return values
+    @fields.depends('splittype', 'category', 'booktransf')
+    def on_change_with_target(self, name=None):
+        """ get category or cashbook
+        """
+        if self.splittype:
+            if self.splittype == 'cat':
+                if self.category:
+                    return 'cashbook.category,%d' % self.category.id
+            elif self.splittype == 'tr':
+                if self.booktransf:
+                    return 'cashbook.book,%d' % self.booktransf.id
 
     @fields.depends('category')
     def on_change_with_category_view(self, name=None):
@@ -101,6 +159,13 @@ class SplitLine(ModelSQL, ModelView):
         if self.line:
             return self.line.state
 
+    @fields.depends('line', '_parent_line.cashbook')
+    def on_change_with_cashbook(self, name=None):
+        """ get cashbook
+        """
+        if self.line:
+            return self.line.cashbook.id
+
     @fields.depends('line', '_parent_line.cashbook')
     def on_change_with_state_cashbook(self, name=None):
         """ get state of cashbook
@@ -108,6 +173,13 @@ class SplitLine(ModelSQL, ModelView):
         if self.line:
             return self.line.cashbook.state
 
+    @fields.depends('line', '_parent_line.cashbook')
+    def on_change_with_owner_cashbook(self, name=None):
+        """ get current owner
+        """
+        if self.line:
+            return self.line.cashbook.owner.id
+
     @fields.depends('line', '_parent_line.bookingtype')
     def on_change_with_bookingtype(self, name=None):
         """ get type
@@ -138,6 +210,11 @@ class SplitLine(ModelSQL, ModelView):
         Line2 = Pool().get('cashbook.line')
 
         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))
+
         records = super(SplitLine, cls).create(vlist)
 
         to_update_line = []
@@ -147,6 +224,7 @@ class SplitLine(ModelSQL, ModelView):
 
         if len(to_update_line) > 0:
             Line2.update_amount_by_splitlines(to_update_line)
+        return records
 
     @classmethod
     def write(cls, *args):
@@ -176,6 +254,6 @@ class SplitLine(ModelSQL, ModelView):
         Line2 = Pool().get('cashbook.line')
 
         Line2.check_permission_delete([x.line for x in splitlines])
-        return super(SplitLine, cls).delete(splitlines)
+        super(SplitLine, cls).delete(splitlines)
 
 # end SplitLine

tests/__init__.py

@@ -11,11 +11,14 @@ from trytond.modules.cashbook.tests.test_splitline import SplitLineTestCase
 from trytond.modules.cashbook.tests.test_config import ConfigTestCase
 from trytond.modules.cashbook.tests.test_category import CategoryTestCase
 from trytond.modules.cashbook.tests.test_reconciliation import ReconTestCase
+from trytond.modules.cashbook.tests.test_bookingwiz import BookingWizardTestCase
+
 
 __all__ = ['suite']
 
 
 class CashbookTestCase(\
+    BookingWizardTestCase,\
     ReconTestCase,\
     CategoryTestCase,\
     ConfigTestCase,\

tests/test_book.py

@@ -51,10 +51,145 @@ class BookTestCase(ModuleTestCase):
             'number_sequ': self.prep_sequence().id,
             }])
         self.assertEqual(book.name, 'Book 1')
+        self.assertEqual(book.rec_name, 'Book 1 | 0.00 usd | Open')
         self.assertEqual(book.btype.rec_name, 'CAS - Cash')
         self.assertEqual(book.state, 'open')
         self.assertEqual(book.state_string, 'Open')
 
+    @with_transaction()
+    def test_book_create_2nd_currency(self):
+        """ create cashbook, in 2nd currency, check balance-fields
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+
+        types = self.prep_type()
+        company = self.prep_company()
+
+        # add EURO, set company-currency to EURO
+        (usd, euro) = self.prep_2nd_currency(company)
+        category = self.prep_category(cattype='in')
+        self.assertEqual(company.currency.rec_name, 'Euro')
+        party = self.prep_party()
+
+        book, = Book.create([{
+            'name': 'Book 1',
+            'btype': types.id,
+            'company': company.id,
+            'currency': usd.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            'lines': [('create', [{
+                    'date': date(2022, 5, 5),
+                    'description': 'Amount in USD',
+                    'bookingtype': 'in',
+                    'category': category.id,
+                    'amount': Decimal('10.0'),
+                    'party': party.id,
+                }])],
+            }])
+
+        with Transaction().set_context({
+                'date': date(2022, 5, 5),
+            }):
+            self.assertEqual(book.rec_name, 'Book 1 | 10.00 usd | Open')
+            self.assertEqual(book.currency.rec_name, 'usd')
+            self.assertEqual(book.currency.rate, Decimal('1.05'))
+            self.assertEqual(book.company_currency.rec_name, 'Euro')
+            self.assertEqual(book.company_currency.rate, Decimal('1.0'))
+
+            self.assertEqual(book.balance, Decimal('10.0'))
+            self.assertEqual(book.balance_ref, Decimal('9.52'))
+
+            self.assertEqual(len(book.lines), 1)
+            self.assertEqual(book.lines[0].rec_name,
+                '05/05/2022|Rev|10.00 usd|Amount in USD [Cat1]')
+
+    @with_transaction()
+    def test_book_create_2nd_currency_hierarchical(self):
+        """ create cashbook-hierarchy, in 2nd currency,
+            check balance-fields
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+
+        types = self.prep_type()
+        company = self.prep_company()
+
+        # add EURO, set company-currency to EURO
+        (usd, euro) = self.prep_2nd_currency(company)
+        category = self.prep_category(cattype='in')
+        self.assertEqual(company.currency.rec_name, 'Euro')
+        party = self.prep_party()
+
+        book, = Book.create([{
+            'name': 'Book 1',
+            'company': company.id,
+            'currency': euro.id,
+            'childs': [('create', [{
+                'name': 'Book 2',
+                'btype': types.id,
+                'company': company.id,
+                'currency': usd.id,
+                'number_sequ': self.prep_sequence().id,
+                'start_date': date(2022, 5, 1),
+                'lines': [('create', [{
+                        'date': date(2022, 5, 5),
+                        'description': 'Amount in USD',
+                        'bookingtype': 'in',
+                        'category': category.id,
+                        'amount': Decimal('10.0'),
+                        'party': party.id,
+                    }])],
+                }])],
+            }])
+
+        with Transaction().set_context({
+                'date': date(2022, 5, 5),
+            }):
+            self.assertEqual(book.rec_name, 'Book 1')
+            self.assertEqual(book.currency.rec_name, 'Euro')
+            self.assertEqual(book.currency.rate, Decimal('1.0'))
+            self.assertEqual(book.company_currency, None)
+            self.assertEqual(book.balance, Decimal('9.52'))
+            self.assertEqual(book.balance_ref, None)
+            self.assertEqual(len(book.lines), 0)
+            self.assertEqual(len(book.childs), 1)
+
+            self.assertEqual(book.childs[0].rec_name, 'Book 1/Book 2 | 10.00 usd | Open')
+            self.assertEqual(book.childs[0].currency.rec_name, 'usd')
+            self.assertEqual(book.childs[0].currency.rate, Decimal('1.05'))
+            self.assertEqual(book.childs[0].company_currency.rec_name, 'Euro')
+            self.assertEqual(book.childs[0].balance, Decimal('10.0'))
+            self.assertEqual(book.childs[0].balance_ref, Decimal('9.52'))
+            self.assertEqual(len(book.childs[0].lines), 1)
+
+    @with_transaction()
+    def test_book_create_hierarchy(self):
+        """ create cashbook, hierarchical
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+
+        types = self.prep_type()
+        company = self.prep_company()
+        book, = Book.create([{
+            'name': 'Level 1',
+            'btype': None,
+            'company': company.id,
+            'childs': [('create', [{
+                    'name': 'Level 2',
+                    'btype': types.id,
+                    'company': company.id,
+                    'currency': company.currency.id,
+                    'number_sequ': self.prep_sequence().id,
+                }])],
+            }])
+        self.assertEqual(book.name, 'Level 1')
+        self.assertEqual(book.rec_name, 'Level 1')
+        self.assertEqual(len(book.childs), 1)
+        self.assertEqual(book.childs[0].rec_name, 'Level 1/Level 2 | 0.00 usd | Open')
+
     @with_transaction()
     def test_book_deny_delete_open(self):
         """ create cashbook, add lines, try to delete in state 'open'
@@ -90,6 +225,62 @@ class BookTestCase(ModuleTestCase):
             Book.delete,
             [book])
 
+    @with_transaction()
+    def test_book_deny_btype_set_none(self):
+        """ create cashbook, add lines,
+            try to set btype to None with lines
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+
+        types = self.prep_type()
+        category = self.prep_category(cattype='in')
+        company = self.prep_company()
+        party = self.prep_party()
+        book, = Book.create([{
+            'name': 'Book 1',
+            'btype': types.id,
+            'company': company.id,
+            'currency': company.currency.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            'lines': [('create', [{
+                'date': date(2022, 5, 1),
+                'description': 'test 1',
+                'category': category.id,
+                'bookingtype': 'in',
+                'amount': Decimal('1.0'),
+                'party': party.id,
+                }])],
+            }])
+        self.assertEqual(book.name, 'Book 1')
+        self.assertEqual(book.btype.rec_name, 'CAS - Cash')
+
+        self.assertRaisesRegex(UserError,
+            "The type cannot be deleted on the cash book 'Book 1 | 1.00 usd | Open' because it still contains 1 lines.",
+            Book.write,
+            *[
+                [book],
+                {
+                    'btype': None,
+                },
+            ])
+
+        Book.write(*[
+            [book],
+            {
+                'lines': [('delete', [book.lines[0].id])],
+            }])
+        self.assertEqual(len(book.lines), 0)
+        self.assertEqual(book.btype.rec_name, 'CAS - Cash')
+
+        Book.write(*[
+            [book],
+            {
+                'btype': None,
+            }])
+        self.assertEqual(book.btype, None)
+
     @with_transaction()
     def test_book_deny_delete_closed(self):
         """ create cashbook, add lines, try to delete in state 'closed'
@@ -225,62 +416,6 @@ class BookTestCase(ModuleTestCase):
                 },
             ])
 
-    @with_transaction()
-    def test_book_deny_update_start_amount(self):
-        """ create cashbook, add lines, update start-amount
-        """
-        pool = Pool()
-        Book = pool.get('cashbook.book')
-
-        types = self.prep_type()
-        company = self.prep_company()
-        category = self.prep_category(cattype='in')
-        party = self.prep_party()
-        book, = Book.create([{
-            'name': 'Book 1',
-            'btype': types.id,
-            'company': company.id,
-            'currency': company.currency.id,
-            'number_sequ': self.prep_sequence().id,
-            }])
-        self.assertEqual(book.name, 'Book 1')
-        self.assertEqual(book.start_balance, Decimal('0.0'))
-        self.assertEqual(book.rec_name, 'Book 1 | 0.00 usd | Open')
-
-        Book.write(*[
-            [book],
-            {
-                'start_balance': Decimal('1.0'),
-            }])
-        self.assertEqual(book.start_balance, Decimal('1.0'))
-        self.assertEqual(book.balance, Decimal('1.0'))
-
-        Book.write(*[
-            [book],
-            {
-                'lines': [('create', [{
-                    'amount': Decimal('2.0'),
-                    'description': 'Test',
-                    'category': category.id,
-                    'bookingtype': 'in',
-                    'party': party.id,
-                    }])],
-            }])
-        self.assertEqual(book.start_balance, Decimal('1.0'))
-        self.assertEqual(book.balance, Decimal('3.0'))
-        self.assertEqual(len(book.lines), 1)
-        self.assertEqual(book.lines[0].balance, Decimal('3.0'))
-
-        self.assertRaisesRegex(UserError,
-            "The initial amount of the cash book 'Fridas book | 3.00 usd | Open' cannot be changed because it already contains bookings.",
-            Book.write,
-            *[
-                [book],
-                {
-                    'start_balance': Decimal('1.5'),
-                },
-            ])
-
     @with_transaction()
     def test_book_permission_owner(self):
         """ create book + 2x users, add users to group, check access

tests/test_bookingwiz.py

@@ -0,0 +1,176 @@
+# -*- coding: utf-8 -*-
+# This file is part of the cashbook-module from m-ds for Tryton.
+# The COPYRIGHT file at the top level of this repository contains the
+# full copyright notices and license terms.
+
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
+from trytond.transaction import Transaction
+from trytond.exceptions import UserError
+from datetime import date
+from decimal import Decimal
+from unittest.mock import MagicMock
+
+
+class BookingWizardTestCase(ModuleTestCase):
+    'Test cashbook booking wizard module'
+    module = 'cashbook'
+
+    @with_transaction()
+    def test_bookwiz_expense(self):
+        """ run booking-wizard to store expense
+        """
+        pool = Pool()
+        BookingWiz = pool.get('cashbook.enterbooking', type='wizard')
+        Book = pool.get('cashbook.book')
+        Category = pool.get('cashbook.category')
+        Party = pool.get('party.party')
+        IrDate = pool.get('ir.date')
+
+        company = self.prep_company()
+        with Transaction().set_context({
+            'company': company.id,
+            }):
+            types = self.prep_type()
+            book, = Book.create([{
+                'name': 'Cash Book',
+                'btype': types.id,
+                'company': company.id,
+                'currency': company.currency.id,
+                'number_sequ': self.prep_sequence().id,
+                'start_date': date(2022, 1, 1),
+                }])
+
+            party, = Party.create([{
+                'name': 'Foodshop Zehlendorf',
+                'addresses':[('create', [{}])],
+                }])
+
+            categories = Category.create([{
+                    'name':'Income',
+                    'cattype': 'in',
+                }, {
+                    'name': 'Food',
+                    'cattype': 'out',
+                }])
+
+            (sess_id, start_state, end_state) = BookingWiz.create()
+            w_obj = BookingWiz(sess_id)
+            self.assertEqual(start_state, 'start')
+            self.assertEqual(end_state, 'end')
+
+            result = BookingWiz.execute(sess_id, {}, start_state)
+            self.assertEqual(list(result.keys()), ['view'])
+            self.assertEqual(result['view']['defaults']['bookingtype'], 'out')
+            self.assertEqual(result['view']['defaults']['cashbook'], None)
+            self.assertEqual(result['view']['defaults']['amount'], None)
+            self.assertEqual(result['view']['defaults']['party'], None)
+            self.assertEqual(result['view']['defaults']['booktransf'], None)
+            self.assertEqual(result['view']['defaults']['description'], None)
+            self.assertEqual(result['view']['defaults']['category'], None)
+
+            self.assertEqual(len(book.lines), 0)
+
+            r1 = {
+                'amount': Decimal('10.0'),
+                'cashbook': book.id,
+                'party': party.id,
+                'description': 'Test 1',
+                'category': categories[1].id,
+                'bookingtype': 'out',
+                }
+            for x in r1.keys():
+                setattr(w_obj.start, x, r1[x])
+
+            IrDate.today = MagicMock(return_value=date(2022, 5, 1))
+            result = BookingWiz.execute(sess_id, {'start': r1}, 'save_')
+            BookingWiz.delete(sess_id)
+            IrDate.today = MagicMock(return_value=date.today())
+
+            self.assertEqual(len(book.lines), 1)
+            self.assertEqual(book.lines[0].rec_name, '05/01/2022|Exp|-10.00 usd|Test 1 [Food]')
+
+    @with_transaction()
+    def test_bookwiz_transfer(self):
+        """ run booking-wizard to store expense
+        """
+        pool = Pool()
+        BookingWiz = pool.get('cashbook.enterbooking', type='wizard')
+        Book = pool.get('cashbook.book')
+        Category = pool.get('cashbook.category')
+        Party = pool.get('party.party')
+        IrDate = pool.get('ir.date')
+
+        company = self.prep_company()
+        with Transaction().set_context({
+            'company': company.id,
+            }):
+            types = self.prep_type()
+            books = Book.create([{
+                'name': 'Cash Book',
+                'btype': types.id,
+                'company': company.id,
+                'currency': company.currency.id,
+                'number_sequ': self.prep_sequence().id,
+                'start_date': date(2022, 1, 1),
+                }, {
+                'name': 'Bank',
+                'btype': types.id,
+                'company': company.id,
+                'currency': company.currency.id,
+                'number_sequ': self.prep_sequence().id,
+                'start_date': date(2022, 1, 1),
+                }])
+
+            party, = Party.create([{
+                'name': 'Foodshop Zehlendorf',
+                'addresses':[('create', [{}])],
+                }])
+
+            categories = Category.create([{
+                    'name':'Income',
+                    'cattype': 'in',
+                }, {
+                    'name': 'Food',
+                    'cattype': 'out',
+                }])
+
+            (sess_id, start_state, end_state) = BookingWiz.create()
+            w_obj = BookingWiz(sess_id)
+            self.assertEqual(start_state, 'start')
+            self.assertEqual(end_state, 'end')
+
+            result = BookingWiz.execute(sess_id, {}, start_state)
+            self.assertEqual(list(result.keys()), ['view'])
+            self.assertEqual(result['view']['defaults']['bookingtype'], 'out')
+            self.assertEqual(result['view']['defaults']['cashbook'], None)
+            self.assertEqual(result['view']['defaults']['amount'], None)
+            self.assertEqual(result['view']['defaults']['party'], None)
+            self.assertEqual(result['view']['defaults']['booktransf'], None)
+            self.assertEqual(result['view']['defaults']['description'], None)
+            self.assertEqual(result['view']['defaults']['category'], None)
+
+            self.assertEqual(len(books[0].lines), 0)
+            self.assertEqual(len(books[1].lines), 0)
+
+            r1 = {
+                'amount': Decimal('10.0'),
+                'cashbook': books[0].id,
+                'description': 'Test 1',
+                'booktransf': books[1].id,
+                'bookingtype': 'mvout',
+                }
+            for x in r1.keys():
+                setattr(w_obj.start, x, r1[x])
+
+            IrDate.today = MagicMock(return_value=date(2022, 5, 1))
+            result = BookingWiz.execute(sess_id, {'start': r1}, 'save_')
+            BookingWiz.delete(sess_id)
+            IrDate.today = MagicMock(return_value=date.today())
+
+            self.assertEqual(len(books[0].lines), 1)
+            self.assertEqual(len(books[1].lines), 0)
+            self.assertEqual(books[0].lines[0].rec_name,
+                '05/01/2022|to|-10.00 usd|Test 1 [Bank | 0.00 usd | Open]')
+
+# end BookingWizardTestCase

tests/test_category.py

@@ -28,6 +28,72 @@ class CategoryTestCase(ModuleTestCase):
             }])
         return category
 
+    @with_transaction()
+    def test_category_check_rec_name(self):
+        """ create category, test rec_name, search, order
+        """
+        pool = Pool()
+        Category = pool.get('cashbook.category')
+        company = self.prep_company()
+
+        Category.create([{
+            'company': company.id,
+            'name': 'Level 1',
+            'cattype': 'in',
+            'childs': [('create', [{
+                'company': company.id,
+                'name': 'Level 2a',
+                'cattype': 'in',
+                }, {
+                'company': company.id,
+                'name': 'Level 2b',
+                'cattype': 'in',
+                }])],
+            }, {
+            'company': company.id,
+            'name': 'Level 1b',
+            'cattype': 'in',
+            'childs': [('create', [{
+                'company': company.id,
+                'name': 'Level 1b.2a',
+                'cattype': 'in',
+                }, {
+                'company': company.id,
+                'name': 'Level 1b.2b',
+                'cattype': 'in',
+                }])],
+            }])
+
+        self.assertEqual(Category.search_count([
+                ('rec_name', 'ilike', '%1b.2b%'),
+            ]), 1)
+        self.assertEqual(Category.search_count([
+                ('rec_name', 'ilike', '%1b.2%'),
+            ]), 2)
+        self.assertEqual(Category.search_count([
+                ('rec_name', '=', 'Level 1b/Level 1b.2b'),
+            ]), 1)
+
+        # ordering #1
+        categories = Category.search([], order=[('rec_name', 'ASC')])
+        self.assertEqual(len(categories), 6)
+        self.assertEqual(categories[0].rec_name, 'Level 1')
+        self.assertEqual(categories[1].rec_name, 'Level 1b')
+        self.assertEqual(categories[2].rec_name, 'Level 1b/Level 1b.2a')
+        self.assertEqual(categories[3].rec_name, 'Level 1b/Level 1b.2b')
+        self.assertEqual(categories[4].rec_name, 'Level 1/Level 2a')
+        self.assertEqual(categories[5].rec_name, 'Level 1/Level 2b')
+
+        # ordering #2
+        categories = Category.search([], order=[('rec_name', 'DESC')])
+        self.assertEqual(len(categories), 6)
+        self.assertEqual(categories[0].rec_name, 'Level 1/Level 2b')
+        self.assertEqual(categories[1].rec_name, 'Level 1/Level 2a')
+        self.assertEqual(categories[2].rec_name, 'Level 1b/Level 1b.2b')
+        self.assertEqual(categories[3].rec_name, 'Level 1b/Level 1b.2a')
+        self.assertEqual(categories[4].rec_name, 'Level 1b')
+        self.assertEqual(categories[5].rec_name, 'Level 1')
+
     @with_transaction()
     def test_category_create_check_category_type(self):
         """ create category, update type of category
@@ -90,6 +156,7 @@ class CategoryTestCase(ModuleTestCase):
             cat1, = Category.create([{
                 'name': 'Test 1',
                 'description': 'Info',
+                'cattype': 'in',
                 }])
             self.assertEqual(cat1.name, 'Test 1')
             self.assertEqual(cat1.rec_name, 'Test 1')
@@ -97,10 +164,11 @@ class CategoryTestCase(ModuleTestCase):
             self.assertEqual(cat1.company.rec_name, 'm-ds')
             self.assertEqual(cat1.parent, None)
 
-            # duplicate, allowed
+            # duplicate of different type, allowed
             cat2, = Category.create([{
                 'name': 'Test 1',
                 'description': 'Info',
+                'cattype': 'out',
                 }])
             self.assertEqual(cat2.name, 'Test 1')
             self.assertEqual(cat2.rec_name, 'Test 1')
@@ -108,6 +176,16 @@ class CategoryTestCase(ModuleTestCase):
             self.assertEqual(cat2.company.rec_name, 'm-ds')
             self.assertEqual(cat2.parent, None)
 
+            # deny duplicate of same type
+            self.assertRaisesRegex(UserError,
+                'The category name already exists at this level.',
+                Category.create,
+                [{
+                    'name': 'Test 1',
+                    'description': 'Info',
+                    'cattype': 'in',
+                }])
+
     @with_transaction()
     def test_category_create_nodupl_diff_level(self):
         """ create category

tests/test_config.py

@@ -42,6 +42,7 @@ class ConfigTestCase(ModuleTestCase):
         self.assertEqual(cfg2.checked, True)
         self.assertEqual(cfg2.done, False)
         self.assertEqual(cfg2.catnamelong, True)
+        self.assertEqual(cfg2.defbook, None)
         return cfg2
 
     def prep_party(self, name='Party'):
@@ -97,6 +98,13 @@ class ConfigTestCase(ModuleTestCase):
             'rate': Decimal('1.05'),
             }])
 
+        # delete unwanted rates
+        usd_1 = CurrencyRate.search([
+            ('currency.id', '=', usd.id),
+            ('date', '!=', date(2022, 5, 2)),
+            ])
+        CurrencyRate.delete(usd_1)
+
         return (usd, euro)
 
     @with_transaction()
@@ -105,6 +113,37 @@ class ConfigTestCase(ModuleTestCase):
         """
         self.prep_config()
 
+    @with_transaction()
+    def test_config_defbook(self):
+        """ create config, add default-cashbook
+        """
+        pool = Pool()
+        Configuration = pool.get('cashbook.configuration')
+        Book = pool.get('cashbook.book')
+
+        self.prep_config()
+        types = self.prep_type()
+        company = self.prep_company()
+        book, = Book.create([{
+            'name': 'Book 1',
+            'btype': types.id,
+            'company': company.id,
+            'currency': company.currency.id,
+            'number_sequ': self.prep_sequence().id,
+            }])
+        self.assertEqual(book.name, 'Book 1')
+
+        cfg1 = Configuration.get_singleton()
+
+        Configuration.write(*[
+            [cfg1],
+            {
+                'defbook': book.id,
+            }])
+
+        cfg2 = Configuration.get_singleton()
+        self.assertEqual(cfg2.defbook.rec_name, 'Book 1 | 0.00 usd | Open')
+
     @with_transaction()
     def test_config_create_multi_user(self):
         """ create config, multi-user

tests/test_line.py

@@ -16,6 +16,211 @@ class LineTestCase(ModuleTestCase):
     'Test cashbook line module'
     module = 'cashbook'
 
+    @with_transaction()
+    def test_line_check_add_amount2nd_currency(self):
+        """ create cashbook, lines, add transfer without
+            amount_2nd_currency
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Lines = pool.get('cashbook.line')
+        Currency = pool.get('currency.currency')
+
+        types = self.prep_type()
+        company = self.prep_company()
+
+        # add EURO, set company-currency to EURO
+        (usd, euro) = self.prep_2nd_currency(company)
+        self.assertEqual(len(usd.rates), 1)
+        self.assertEqual(usd.rates[0].date, date(2022, 5, 2))
+        self.assertEqual(usd.rates[0].rate, Decimal('1.05'))
+        Currency.write(*[
+            [usd],
+            {
+                'rates': [('create', [{
+                    'rate': Decimal('1.02'),
+                    'date': date(2022, 6, 1),
+                    }])],
+            }])
+        self.assertEqual(len(usd.rates), 2)
+
+        books = Book.create([{
+            'name': 'Book USD',
+            'btype': types.id,
+            'company': company.id,
+            'currency': usd.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            }, {
+            'name': 'Book EURO',
+            'btype': types.id,
+            'company': company.id,
+            'currency': euro.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            }])
+        self.assertEqual(len(books), 2)
+        self.assertEqual(books[0].rec_name, 'Book USD | 0.00 usd | Open')
+        self.assertEqual(books[1].rec_name, 'Book EURO | 0.00 € | Open')
+
+        # rate @ 2022-05-02: 1.05
+        Book.write(*[
+            [books[0]],
+            {
+                'lines': [('create', [{
+                        'date': date(2022, 5, 5),
+                        'description': 'Transfer USD --> EUR',
+                        'bookingtype': 'mvout',
+                        'amount': Decimal('10.0'),
+                        'booktransf': books[1].id,
+                    }])],
+            }])
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name,
+            '05/05/2022|to|-10.00 usd|Transfer USD --> EUR [Book EURO | 0.00 € | Open]')
+        self.assertEqual(books[0].lines[0].amount, Decimal('10.0'))
+        # auto-created
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.52'))
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.952'))
+        Lines.delete(books[0].lines)
+
+       # rate @ 2022-06-01: 1.02
+        Book.write(*[
+            [books[0]],
+            {
+                'lines': [('create', [{
+                        'date': date(2022, 6, 1),
+                        'description': 'Transfer USD --> EUR',
+                        'bookingtype': 'mvout',
+                        'amount': Decimal('10.0'),
+                        'booktransf': books[1].id,
+                    }])],
+            }])
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name,
+            '06/01/2022|to|-10.00 usd|Transfer USD --> EUR [Book EURO | 0.00 € | Open]')
+        self.assertEqual(books[0].lines[0].amount, Decimal('10.0'))
+        # auto-created
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.80'))
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.98'))
+        Lines.delete(books[0].lines)
+
+        Book.write(*[
+            [books[0]],
+            {
+                'lines': [('create', [{
+                        'date': date(2022, 5, 5),
+                        'description': 'Transfer USD --> EUR',
+                        'bookingtype': 'mvout',
+                        'amount': Decimal('10.0'),
+                        'booktransf': books[1].id,
+                        'amount_2nd_currency': Decimal('8.5'),
+                    }])],
+            }])
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name,
+            '05/05/2022|to|-10.00 usd|Transfer USD --> EUR [Book EURO | 0.00 € | Open]')
+        self.assertEqual(books[0].lines[0].amount, Decimal('10.0'))
+        # manual set
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('8.5'))
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.85'))
+
+        # update rate to get new amount_2nd_currency
+        Lines.write(*[
+            [books[0].lines[0]],
+            {
+                'rate_2nd_currency': Decimal('0.9'),
+            }])
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.0'))
+
+        # update amount, rate, amount_2nd_currency
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.9'))
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.0'))
+        self.assertEqual(books[0].lines[0].amount, Decimal('10.0'))
+
+        books[0].lines[0].amount = Decimal('12.0')
+        books[0].lines[0].on_change_amount()
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.9'))
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('10.8'))
+        self.assertEqual(books[0].lines[0].amount, Decimal('12.0'))
+
+        books[0].lines[0].rate_2nd_currency = Decimal('0.95')
+        books[0].lines[0].on_change_rate_2nd_currency()
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.95'))
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('11.4'))
+        self.assertEqual(books[0].lines[0].amount, Decimal('12.0'))
+
+        books[0].lines[0].amount_2nd_currency = Decimal('10.5')
+        books[0].lines[0].on_change_amount_2nd_currency()
+        self.assertEqual(books[0].lines[0].rate_2nd_currency, Decimal('0.875'))
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('10.5'))
+        self.assertEqual(books[0].lines[0].amount, Decimal('12.0'))
+
+    @with_transaction()
+    def test_line_check_migrate_amount_2nd_currency(self):
+        """ create cashbook, lines, transfer
+            check migration
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Lines = pool.get('cashbook.line')
+        tab_line = Lines.__table__()
+        cursor = Transaction().connection.cursor()
+
+        types = self.prep_type()
+        company = self.prep_company()
+
+        # add EURO, set company-currency to EURO
+        (usd, euro) = self.prep_2nd_currency(company)
+
+        books = Book.create([{
+            'name': 'Book USD',
+            'btype': types.id,
+            'company': company.id,
+            'currency': usd.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            }, {
+            'name': 'Book EURO',
+            'btype': types.id,
+            'company': company.id,
+            'currency': euro.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            }])
+        self.assertEqual(len(books), 2)
+        self.assertEqual(books[0].rec_name, 'Book USD | 0.00 usd | Open')
+        self.assertEqual(books[1].rec_name, 'Book EURO | 0.00 € | Open')
+
+        Book.write(*[
+            [books[0]],
+            {
+                'lines': [('create', [{
+                        'date': date(2022, 5, 5),
+                        'description': 'Transfer USD --> EUR',
+                        'bookingtype': 'mvout',
+                        'amount': Decimal('10.0'),
+                        'booktransf': books[1].id,
+                    }])],
+            }])
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(len(books[1].lines), 0)
+        self.assertEqual(books[0].lines[0].rec_name,
+            '05/05/2022|to|-10.00 usd|Transfer USD --> EUR [Book EURO | 0.00 € | Open]')
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.52'))
+
+        # clear field 'amount_2nd_currency' to prepare for migration
+        clear_field = tab_line.update(
+                columns = [tab_line.amount_2nd_currency],
+                values = [None],
+                where = (tab_line.id == books[0].lines[0].id),
+            )
+        cursor.execute(*clear_field)
+
+        # migrate
+        Lines.migrate_amount_2nd_currency()
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.52'))
+
     @with_transaction()
     def test_line_check_transfer_2nd_currency_out(self):
         """ create cashbook, lines, transfer amount between
@@ -66,6 +271,7 @@ class LineTestCase(ModuleTestCase):
         self.assertEqual(len(books[1].lines), 0)
         self.assertEqual(books[0].lines[0].rec_name,
             '05/05/2022|to|-10.00 usd|Transfer USD --> EUR [Book EURO | 0.00 € | Open]')
+        self.assertEqual(books[0].lines[0].amount_2nd_currency, Decimal('9.52'))
         self.assertEqual(books[0].lines[0].reference, None)
         self.assertEqual(len(books[0].lines[0].references), 0)
         self.assertEqual(books[0].lines[0].reconciliation, None)
@@ -366,6 +572,93 @@ class LineTestCase(ModuleTestCase):
         self.assertEqual(book.lines[3].reconciliation, None)
         self.assertEqual(book.lines[3].state, 'edit')
 
+    @with_transaction()
+    def test_line_set_number_with_done(self):
+        """ create cashbook + line, write number to line
+            at state-change check->done
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Lines = pool.get('cashbook.line')
+        Reconciliation = pool.get('cashbook.recon')
+
+        types = self.prep_type()
+        category = self.prep_category(cattype='in')
+        company = self.prep_company()
+        party = self.prep_party()
+        with Transaction().set_context({
+            'company': company.id,
+            }):
+            book, = Book.create([{
+                'name': 'Book 1',
+                'btype': types.id,
+                'company': company.id,
+                'currency': company.currency.id,
+                'number_sequ': self.prep_sequence().id,
+                'start_date': date(2022, 5, 1),
+                'number_atcheck': False,
+                'lines': [('create', [{
+                        'date': date(2022, 5, 1),
+                        'description': 'Text 1',
+                        'category': category.id,
+                        'bookingtype': 'in',
+                        'amount': Decimal('1.0'),
+                        'party': party.id,
+                    }, {
+                        'date': date(2022, 5, 2),
+                        'description': 'Text 2',
+                        'category': category.id,
+                        'bookingtype': 'in',
+                        'amount': Decimal('1.0'),
+                        'party': party.id,
+                    }])],
+                }])
+            self.assertEqual(book.name, 'Book 1')
+            self.assertEqual(book.btype.rec_name, 'CAS - Cash')
+            self.assertEqual(book.state, 'open')
+            self.assertEqual(book.number_atcheck, False)
+            self.assertEqual(len(book.lines), 2)
+            self.assertEqual(book.lines[0].date, date(2022, 5, 1))
+            self.assertEqual(book.lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
+            self.assertEqual(book.lines[0].state_cashbook, 'open')
+            self.assertEqual(book.lines[1].date, date(2022, 5, 2))
+            self.assertEqual(book.lines[1].rec_name, '05/02/2022|Rev|1.00 usd|Text 2 [Cat1]')
+
+            # add reconciliation
+            Book.write(*[
+                [book],
+                {
+                    'reconciliations': [('create', [{
+                        'date': date(2022, 5, 1),
+                        'date_from': date(2022, 5, 1),
+                        'date_to': date(2022, 5, 30),
+                        }])],
+                }])
+            self.assertEqual(len(book.reconciliations), 1)
+            self.assertEqual(len(book.reconciliations[0].lines), 0)
+            self.assertEqual(book.reconciliations[0].date_from, date(2022, 5, 1))
+            self.assertEqual(book.reconciliations[0].date_to, date(2022, 5, 30))
+            self.assertEqual(book.reconciliations[0].state, 'edit')
+
+            Lines.wfcheck(book.lines)
+            self.assertEqual(book.lines[0].state, 'check')
+            self.assertEqual(book.lines[0].number, None)
+            self.assertEqual(book.lines[1].state, 'check')
+            self.assertEqual(book.lines[1].number, None)
+
+            Reconciliation.wfcheck(book.reconciliations)
+            self.assertEqual(len(book.reconciliations[0].lines), 2)
+            self.assertEqual(book.reconciliations[0].lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
+            self.assertEqual(book.reconciliations[0].lines[1].rec_name, '05/02/2022|Rev|1.00 usd|Text 2 [Cat1]')
+            self.assertEqual(book.reconciliations[0].lines[0].number, None)
+            self.assertEqual(book.reconciliations[0].lines[1].number, None)
+
+            Reconciliation.wfdone(book.reconciliations)
+            self.assertEqual(book.reconciliations[0].lines[0].number, '1')
+            self.assertEqual(book.reconciliations[0].lines[0].state, 'done')
+            self.assertEqual(book.reconciliations[0].lines[1].number, '2')
+            self.assertEqual(book.reconciliations[0].lines[1].state, 'done')
+
     @with_transaction()
     def test_line_create_check_names_search(self):
         """ create cashbook + line
@@ -373,10 +666,18 @@ class LineTestCase(ModuleTestCase):
         pool = Pool()
         Book = pool.get('cashbook.book')
         Lines = pool.get('cashbook.line')
+        Category = pool.get('cashbook.category')
 
         types = self.prep_type()
-        category = self.prep_category(cattype='in')
         company = self.prep_company()
+        category = self.prep_category(cattype='in')
+        category2, = Category.create([{
+            'name': 'sp-cat1',
+            'cattype': 'in',
+            'company': company.id,
+            }])
+        self.assertEqual(category2.rec_name, 'sp-cat1')
+
         party = self.prep_party()
         book, = Book.create([{
             'name': 'Book 1',
@@ -399,33 +700,60 @@ class LineTestCase(ModuleTestCase):
                     'bookingtype': 'in',
                     'amount': Decimal('1.0'),
                     'party': party.id,
+                }, {
+                    'date': date(2022, 5, 3),
+                    'description': 'Text 3',
+                    'bookingtype': 'spin',
+                    'amount': Decimal('1.0'),
+                    'party': party.id,
+                    'splitlines': [('create', [{
+                        'amount': Decimal('1.0'),
+                        'description': 'text3-spline1',
+                        'category': category2.id,
+                        }])],
                 }])],
             }])
         self.assertEqual(book.name, 'Book 1')
         self.assertEqual(book.btype.rec_name, 'CAS - Cash')
         self.assertEqual(book.state, 'open')
-        self.assertEqual(len(book.lines), 2)
+        self.assertEqual(len(book.lines), 3)
         self.assertEqual(book.lines[0].date, date(2022, 5, 1))
         self.assertEqual(book.lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
         self.assertEqual(book.lines[0].state_cashbook, 'open')
         self.assertEqual(book.lines[1].date, date(2022, 5, 2))
         self.assertEqual(book.lines[1].rec_name, '05/02/2022|Rev|1.00 usd|Text 2 [Cat1]')
+        self.assertEqual(book.lines[2].date, date(2022, 5, 3))
+        self.assertEqual(book.lines[2].rec_name, '05/03/2022|Rev/Sp|1.00 usd|Text 3 [-]')
 
         self.assertEqual(Lines.search_count([('rec_name', '=', 'Text 1')]), 1)
         self.assertEqual(Lines.search_count([('rec_name', '=', 'Text 1a')]), 0)
-        self.assertEqual(Lines.search_count([('rec_name', 'ilike', 'text%')]), 2)
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', 'text%')]), 3)
+        # search in category of split-line
+        self.assertEqual(Lines.search_count([('rec_name', '=', 'sp-cat1')]), 1)
+        # search in description of split-line
+        self.assertEqual(Lines.search_count([('rec_name', '=', 'text3-spline1')]), 1)
+        # ilike fails in fields.Text to find subtext...
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', '%spline%')]), 0)
+        # ...but it uses separator-chars
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', 'text3%')]), 1)
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', 'spline1')]), 1)
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', '%spline1')]), 1)
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', 'spline1%')]), 0)
+        self.assertEqual(Lines.search_count([('rec_name', 'ilike', 'text3')]), 1)
 
-        self.assertEqual(Lines.search_count([('state_cashbook', '=', 'open')]), 2)
+        self.assertEqual(Lines.search_count([('state_cashbook', '=', 'open')]), 3)
         self.assertEqual(Lines.search_count([('state_cashbook', '=', 'closed')]), 0)
-        self.assertEqual(Lines.search_count([('cashbook.state', '=', 'open')]), 2)
+        self.assertEqual(Lines.search_count([('cashbook.state', '=', 'open')]), 3)
         self.assertEqual(Lines.search_count([('cashbook.state', '=', 'closed')]), 0)
 
         # sorting: date -> state -> id
-        self.assertEqual(len(book.lines), 2)
+        self.assertEqual(len(book.lines), 3)
         self.assertEqual(book.lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
         self.assertEqual(book.lines[0].state, 'edit')
         self.assertEqual(book.lines[1].rec_name, '05/02/2022|Rev|1.00 usd|Text 2 [Cat1]')
         self.assertEqual(book.lines[1].state, 'edit')
+        self.assertEqual(book.lines[2].rec_name, '05/03/2022|Rev/Sp|1.00 usd|Text 3 [-]')
+        self.assertEqual(book.lines[2].state, 'edit')
 
         # set to same date
         Lines.write(*[
@@ -439,6 +767,8 @@ class LineTestCase(ModuleTestCase):
         self.assertEqual(book.lines[0].state, 'edit')
         self.assertEqual(book.lines[1].rec_name, '05/01/2022|Rev|1.00 usd|Text 2 [Cat1]')
         self.assertEqual(book.lines[1].state, 'edit')
+        self.assertEqual(book.lines[2].rec_name, '05/01/2022|Rev/Sp|1.00 usd|Text 3 [-]')
+        self.assertEqual(book.lines[2].state, 'edit')
 
         # set to 'check', will sort first
         Lines.wfcheck([book.lines[1]])
@@ -447,6 +777,38 @@ class LineTestCase(ModuleTestCase):
         self.assertEqual(book.lines[0].state, 'check')
         self.assertEqual(book.lines[1].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
         self.assertEqual(book.lines[1].state, 'edit')
+        self.assertEqual(book.lines[2].rec_name, '05/01/2022|Rev/Sp|1.00 usd|Text 3 [-]')
+        self.assertEqual(book.lines[2].state, 'edit')
+
+    @with_transaction()
+    def test_line_to_non_type_book(self):
+        """ create cashbook w/o type
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Line = pool.get('cashbook.line')
+
+        category = self.prep_category(cattype='in')
+        company = self.prep_company()
+        party = self.prep_party()
+        book, = Book.create([{
+            'name': 'Book 1',
+            'btype': None,
+            'company': company.id,
+            }])
+        self.assertEqual(book.name, 'Book 1')
+        self.assertEqual(book.state, 'open')
+
+        self.assertRaisesRegex(UserError,
+            'The value for field "Cashbook" in "Cashbook Line" is not valid according to its domain.',
+            Line.create,
+            [{
+                'cashbook': book.id,
+                'date': date(2022, 5, 1),
+                'category': category.id,
+                'bookingtype': 'in',
+                'amount': Decimal('0.0'),
+            }])
 
     @with_transaction()
     def test_line_create_check_deny_write(self):
@@ -783,11 +1145,25 @@ class LineTestCase(ModuleTestCase):
                     'bookingtype': 'mvout',
                     'amount': Decimal('1.0'),
                     'booktransf': book2.id,
+                }, {
+                    'date': date(2022, 6, 1),       # in-category, return
+                    'description': 'in-return',     # amount negative
+                    'category': category_in.id,
+                    'bookingtype': 'in',
+                    'amount': Decimal('-1.0'),
+                    'party': party.id,
+                }, {
+                    'date': date(2022, 6, 1),       # out-category, return
+                    'description': 'out-return',    # amount negative
+                    'category': category_out.id,
+                    'bookingtype': 'out',
+                    'amount': Decimal('-1.0'),
+                    'party': party.id,
                 }])],
             }])
         self.assertEqual(book.name, 'Book 1')
         self.assertEqual(book.state, 'open')
-        self.assertEqual(len(book.lines), 4)
+        self.assertEqual(len(book.lines), 6)
 
         self.assertEqual(book.lines[0].amount, Decimal('1.0'))
         self.assertEqual(book.lines[0].bookingtype, 'in')
@@ -796,7 +1172,7 @@ class LineTestCase(ModuleTestCase):
 
         # check payee
         self.assertEqual(book.lines[0].payee.rec_name, 'Party')
-        self.assertEqual(Line.search_count([('payee', 'ilike', 'party%')]), 2)
+        self.assertEqual(Line.search_count([('payee', 'ilike', 'party%')]), 4)
         self.assertEqual(Line.search_count([('payee', 'ilike', 'book%')]), 2)
 
         self.assertEqual(book.lines[1].amount, Decimal('1.0'))
@@ -814,6 +1190,16 @@ class LineTestCase(ModuleTestCase):
         self.assertEqual(book.lines[3].credit, Decimal('0.0'))
         self.assertEqual(book.lines[3].debit, Decimal('1.0'))
 
+        self.assertEqual(book.lines[4].amount, Decimal('-1.0'))
+        self.assertEqual(book.lines[4].bookingtype, 'in')
+        self.assertEqual(book.lines[4].credit, Decimal('-1.0'))
+        self.assertEqual(book.lines[4].debit, Decimal('0.0'))
+
+        self.assertEqual(book.lines[5].amount, Decimal('-1.0'))
+        self.assertEqual(book.lines[5].bookingtype, 'out')
+        self.assertEqual(book.lines[5].credit, Decimal('0.0'))
+        self.assertEqual(book.lines[5].debit, Decimal('-1.0'))
+
         Line.write(*[
             [book.lines[0]],
             {

tests/test_reconciliation.py

@@ -49,14 +49,14 @@ class ReconTestCase(ModuleTestCase):
                 'date_to': date(2022, 6, 30),
                 }])],
             }])
-        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
-        self.assertEqual(book.reconciliations[1].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[0].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[1].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
 
         self.assertRaisesRegex(UserError,
             'The date range overlaps with another reconciliation.',
             Reconciliation.write,
             *[
-                [book.reconciliations[1]],
+                [book.reconciliations[0]],
                 {
                     'date_from': date(2022, 4, 15),
                     'date_to': date(2022, 5, 2),
@@ -97,14 +97,14 @@ class ReconTestCase(ModuleTestCase):
                 'date_to': date(2022, 6, 30),
                 }])],
             }])
-        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
-        self.assertEqual(book.reconciliations[1].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[0].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[1].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
 
         self.assertRaisesRegex(UserError,
             'The date range overlaps with another reconciliation.',
             Reconciliation.write,
             *[
-                [book.reconciliations[1]],
+                [book.reconciliations[0]],
                 {
                     'date_from': date(2022, 5, 30),
                 },
@@ -144,14 +144,14 @@ class ReconTestCase(ModuleTestCase):
                 'date_to': date(2022, 6, 30),
                 }])],
             }])
-        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
-        self.assertEqual(book.reconciliations[1].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[0].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[1].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
 
         self.assertRaisesRegex(UserError,
             'The date range overlaps with another reconciliation.',
             Reconciliation.write,
             *[
-                [book.reconciliations[1]],
+                [book.reconciliations[0]],
                 {
                     'date_from': date(2022, 5, 5),
                     'date_to': date(2022, 5, 15),
@@ -192,8 +192,8 @@ class ReconTestCase(ModuleTestCase):
                 'date_to': date(2022, 6, 30),
                 }])],
             }])
-        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
-        self.assertEqual(book.reconciliations[1].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[0].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[1].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
 
         self.assertRaisesRegex(UserError,
             'The date range overlaps with another reconciliation.',
@@ -221,7 +221,6 @@ class ReconTestCase(ModuleTestCase):
             'btype': types.id,
             'company': company.id,
             'currency': company.currency.id,
-            'start_balance': Decimal('12.50'),
             'start_date': date(2022, 5, 1),
             'number_sequ': self.prep_sequence().id,
             'reconciliations': [('create', [{
@@ -234,7 +233,7 @@ class ReconTestCase(ModuleTestCase):
         self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
 
         Reconciliation.wfcheck(list(book.reconciliations))
-        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 12.50 usd - 12.50 usd [0]')
+        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 0.00 usd [0]')
 
     @with_transaction()
     def test_recon_set_start_amount_by_predecessor(self):
@@ -254,7 +253,6 @@ class ReconTestCase(ModuleTestCase):
             'btype': types.id,
             'company': company.id,
             'currency': company.currency.id,
-            'start_balance': Decimal('12.50'),
             'start_date': date(2022, 5, 1),
             'number_sequ': self.prep_sequence().id,
             'reconciliations': [('create', [{
@@ -287,7 +285,7 @@ class ReconTestCase(ModuleTestCase):
         Reconciliation.wfcheck(list(book.reconciliations))
 
         self.assertEqual(book.reconciliations[0].state, 'check')
-        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 12.50 usd - 24.50 usd [2]')
+        self.assertEqual(book.reconciliations[0].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 12.00 usd [2]')
         Reconciliation.wfdone(list(book.reconciliations))
         self.assertEqual(book.reconciliations[0].state, 'done')
 
@@ -298,7 +296,7 @@ class ReconTestCase(ModuleTestCase):
             }])
         self.assertEqual(recons[0].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
         Reconciliation.wfcheck(recons)
-        self.assertEqual(recons[0].rec_name, '05/31/2022 - 06/30/2022 | 24.50 usd - 24.50 usd [0]')
+        self.assertEqual(recons[0].rec_name, '05/31/2022 - 06/30/2022 | 12.00 usd - 12.00 usd [0]')
 
     @with_transaction()
     def test_recon_predecessor_done(self):
@@ -536,9 +534,11 @@ class ReconTestCase(ModuleTestCase):
         self.assertEqual(len(book.reconciliations[0].lines), 1)
         self.assertEqual(book.reconciliations[0].lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
         self.assertEqual(book.lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
+        self.assertEqual(book.lines[0].state, 'check')
         self.assertEqual(book.lines[1].rec_name, '06/01/2022|Rev|1.00 usd|Text 2 [Cat1]')
+        self.assertEqual(book.lines[1].state, 'edit')
 
-        # move 2nd line into date-range of checked-reconciliation, wf-check
+        # move 1st line into date-range of checked-reconciliation, wf-check
         Lines.write(*[
             [book.lines[1]],
             {
@@ -570,7 +570,9 @@ class ReconTestCase(ModuleTestCase):
             'date_from': date(2022, 5, 31),
             'date_to': date(2022, 6, 30),
             }])
-        Reconciliation.wfdone([book.reconciliations[0]])
+        self.assertEqual(book.reconciliations[0].rec_name, '05/31/2022 - 06/30/2022 | 0.00 usd - 0.00 usd [0]')
+        self.assertEqual(book.reconciliations[1].rec_name, '05/01/2022 - 05/31/2022 | 0.00 usd - 1.00 usd [1]')
+        Reconciliation.wfdone([book.reconciliations[1]])
         Reconciliation.wfcheck([recon2])
 
         Lines.write(*[

tests/test_splitline.py

@@ -16,6 +16,193 @@ class SplitLineTestCase(ModuleTestCase):
     'Test split line module'
     module = 'cashbook'
 
+    @with_transaction()
+    def test_splitline_category_and_transfer(self):
+        """ add book, line, two split-lines,
+            category + transfer
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Line = pool.get('cashbook.line')
+
+        types = self.prep_type()
+        category1 = self.prep_category(cattype='in')
+        company = self.prep_company()
+        party = self.prep_party()
+        books = Book.create([{
+            'name': 'Book 1',
+            'btype': types.id,
+            'company': company.id,
+            'currency': company.currency.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            'lines': [('create', [{
+                    'date': date(2022, 5, 1),
+                    'description': 'Text 1',
+                    'category': category1.id,
+                    'bookingtype': 'in',
+                    'amount': Decimal('1.0'),
+                    'party': party.id,
+                }])],
+            }, {
+            'name': 'Book 2',
+            'btype': types.id,
+            'company': company.id,
+            'currency': company.currency.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            }])
+        self.assertEqual(books[0].rec_name, 'Book 1 | 1.00 usd | Open')
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name, '05/01/2022|Rev|1.00 usd|Text 1 [Cat1]')
+        self.assertEqual(books[1].rec_name, 'Book 2 | 0.00 usd | Open')
+
+        Book.write(*[
+            [books[0]],
+            {
+                'lines': [('write', [books[0].lines[0]], {
+                    'bookingtype': 'spin',
+                    'splitlines': [('create', [{
+                        'amount': Decimal('5.0'),
+                        'splittype': 'cat',
+                        'description': 'from category',
+                        'category': category1.id,
+                        }, {
+                        'amount': Decimal('6.0'),
+                        'splittype': 'tr',
+                        'description': 'from cashbook',
+                        'booktransf': books[1].id,
+                        }])],
+                    })]
+            }])
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name, '05/01/2022|Rev/Sp|11.00 usd|Text 1 [-]')
+        self.assertEqual(books[0].lines[0].category, None)
+        self.assertEqual(len(books[0].lines[0].splitlines), 2)
+        self.assertEqual(books[0].lines[0].splitlines[0].rec_name,
+            'Rev/Sp|5.00 usd|from category [Cat1]')
+        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)
+
+        # wf: edit -> check
+        Line.wfcheck(books[0].lines)
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].state, 'check')
+        self.assertEqual(books[0].lines[0].number, '1')
+        self.assertEqual(len(books[0].lines[0].references), 1)
+        self.assertEqual(books[0].lines[0].references[0].rec_name,
+            '05/01/2022|to|-6.00 usd|from cashbook [Book 1 | 11.00 usd | Open]')
+
+        self.assertEqual(len(books[1].lines), 1)
+        self.assertEqual(books[1].lines[0].reference.rec_name,
+            '05/01/2022|Rev/Sp|11.00 usd|Text 1 [-]')
+        self.assertEqual(books[1].lines[0].rec_name,
+            '05/01/2022|to|-6.00 usd|from cashbook [Book 1 | 11.00 usd | Open]')
+
+        # wf: check --> edit
+        Line.wfedit(books[0].lines)
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(len(books[0].lines[0].references), 0)
+        self.assertEqual(len(books[1].lines), 0)
+
+    @with_transaction()
+    def test_splitline_category_and_transfer_2ndcurrency(self):
+        """ add book, line, two split-lines,
+            category + transfer, target-cashbook in USD
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Line = pool.get('cashbook.line')
+
+        types = self.prep_type()
+        category1 = self.prep_category(cattype='out')
+        company = self.prep_company()
+        party = self.prep_party()
+        (usd, euro) = self.prep_2nd_currency(company)
+
+        books = Book.create([{
+            'name': 'Book 1',
+            'btype': types.id,
+            'company': company.id,
+            'currency': euro.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            'lines': [('create', [{
+                    'date': date(2022, 5, 1),
+                    'description': 'Text 1',
+                    'category': category1.id,
+                    'bookingtype': 'out',
+                    'amount': Decimal('1.0'),
+                    'party': party.id,
+                }])],
+            }, {
+            'name': 'Book 2',
+            'btype': types.id,
+            'company': company.id,
+            'currency': usd.id,
+            'number_sequ': self.prep_sequence().id,
+            'start_date': date(2022, 5, 1),
+            }])
+        self.assertEqual(books[0].rec_name, 'Book 1 | -1.00 € | Open')
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name, '05/01/2022|Exp|-1.00 €|Text 1 [Cat1]')
+        self.assertEqual(books[1].rec_name, 'Book 2 | 0.00 usd | Open')
+
+        # EUR --> USD
+        Book.write(*[
+            [books[0]],
+            {
+                'lines': [('write', [books[0].lines[0]], {
+                    'bookingtype': 'spout',
+                    'splitlines': [('create', [{
+                        'amount': Decimal('5.0'),
+                        'splittype': 'cat',
+                        'description': 'to category',
+                        'category': category1.id,
+                        }, {
+                        'amount': Decimal('6.0'),
+                        'splittype': 'tr',
+                        'description': 'to book2',
+                        'booktransf': books[1].id,
+                        }])],
+                    })]
+            }])
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].rec_name, '05/01/2022|Exp/Sp|-11.00 €|Text 1 [-]')
+        self.assertEqual(books[0].lines[0].category, None)
+        self.assertEqual(len(books[0].lines[0].splitlines), 2)
+        self.assertEqual(books[0].lines[0].splitlines[0].rec_name,
+            'Exp/Sp|5.00 €|to category [Cat1]')
+        self.assertEqual(books[0].lines[0].splitlines[0].amount_2nd_currency, None)
+        self.assertEqual(books[0].lines[0].splitlines[1].rec_name,
+            'Exp/Sp|6.00 €|to book2 [Book 2 | 0.00 usd | Open]')
+        self.assertEqual(books[0].lines[0].splitlines[1].amount_2nd_currency, Decimal('6.3'))
+        self.assertEqual(len(books[1].lines), 0)
+
+        # wf: edit -> check
+        Line.wfcheck(books[0].lines)
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(books[0].lines[0].state, 'check')
+        self.assertEqual(books[0].lines[0].number, '1')
+        self.assertEqual(len(books[0].lines[0].references), 1)
+        self.assertEqual(books[0].lines[0].references[0].rec_name,
+            '05/01/2022|from|6.30 usd|to book2 [Book 1 | -11.00 € | Open]')
+
+        self.assertEqual(len(books[1].lines), 1)
+        self.assertEqual(books[1].lines[0].reference.rec_name,
+            '05/01/2022|Exp/Sp|-11.00 €|Text 1 [-]')
+        self.assertEqual(books[1].lines[0].rec_name,
+            '05/01/2022|from|6.30 usd|to book2 [Book 1 | -11.00 € | Open]')
+        self.assertEqual(books[1].lines[0].amount, Decimal('6.3'))
+        self.assertEqual(books[1].lines[0].amount_2nd_currency, Decimal('6.0'))
+
+        # wf: check --> edit
+        Line.wfedit(books[0].lines)
+        self.assertEqual(len(books[0].lines), 1)
+        self.assertEqual(len(books[0].lines[0].references), 0)
+        self.assertEqual(len(books[1].lines), 0)
+
     @with_transaction()
     def test_splitline_check_clear_by_bookingtype(self):
         """ add book, line, category, set line to 'in',

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=6.0.0
+version=6.0.20
 depends:
     res
     currency
@@ -19,4 +19,5 @@ xml:
     splitline.xml
     wizard_openline.xml
     wizard_runreport.xml
+    wizard_booking.xml
     menu.xml

view/book_form.xml

@@ -2,10 +2,10 @@
 <!-- This file is part of the cashbook-module from m-ds for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
-<form col="6">
-    <label name="name"/>
-    <field name="name" colspan="3"/>
-    <group id="grpst" colspan="2" col="3">
+<form col="4">
+    <label name="name" xexpand="0"/>
+    <field name="name" colspan="2"/>
+    <group id="grpst" col="3">
         <label name="state"/>
         <field name="state"/>
         <group id="grpstate" col="3">
@@ -15,33 +15,44 @@ full copyright notices and license terms. -->
         </group>
     </group>
 
-    <label name="number_sequ"/>
-    <field name="number_sequ"/>
-    <label name="number_atcheck"/>
-    <field name="number_atcheck"/>
-    <newline/>
-
+    <label name="balance"/>
+    <field name="balance" symbol="currency"/>
     <label name="btype"/>
     <field name="btype"/>
-    <label name="currency"/>
-    <field name="currency"/>
-    <newline/>
-    <label id="phaccount" colspan="2" string=" "/>
-    <newline/>
 
-    <label name="start_balance"/>
-    <field name="start_balance"/>
-    <label name="balance"/>
-    <field name="balance"/>
-    <newline/>
-    <label name="start_date"/>
-    <field name="start_date"/>
-    <newline/>
+    <label name="balance_all"/>
+    <field name="balance_all" symbol="currency"/>
+    <label name="balance_ref"/>
+    <field name="balance_ref" symbol="company_currency"/>
 
-    <notebook colspan="6">
-        <page id="pgrecon" string="Reconciliations" col="1">
+    <notebook colspan="4">
+        <page name="reconciliations" string="Reconciliations" col="1">
             <field name="reconciliations"/>
         </page>
+        <page name="description" string="Description" col="1">
+            <field name="description"/>
+        </page>
+        <page id="pggeneral" string="General Information" col="4">
+            <label name="company"/>
+            <field name="company"/>
+            <label name="parent"/>
+            <field name="parent"/>
+
+            <label name="currency"/>
+            <field name="currency"/>
+            <newline/>
+
+            <field name="childs" colspan="4"/>
+        </page>
+        <page name="number_sequ" string="Amount and Numbering" col="4">
+            <label name="number_sequ"/>
+            <field name="number_sequ"/>
+            <label name="number_atcheck"/>
+            <field name="number_atcheck"/>
+
+            <label name="start_date"/>
+            <field name="start_date"/>
+        </page>
         <page id="pgperm" string="Owner and Authorizeds" col="4">
             <label name="owner"/>
             <field name="owner"/>

view/book_list.xml

@@ -2,16 +2,9 @@
 <!-- This file is part of the cashbook-module from m-ds for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
-<tree>
-    <field name="name"/>
-    <field name="btype"/>
-    <field name="start_balance"/>
-    <field name="balance"/>
+<tree keyword_open="1">
+    <field name="rec_name"/>
+    <field name="balance" sum="Balance"/>
     <field name="currency"/>
-    <field name="owner"/>
-    <field name="reviewer"/>
-    <field name="observer"/>
     <field name="state"/>
-    <button name="wfopen"/>
-    <button name="wfclosed"/>
 </tree>

view/book_tree.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of the cashbook-module from m-ds for Tryton.
+The COPYRIGHT file at the top level of this repository contains the
+full copyright notices and license terms. -->
+<tree keyword_open="1" tree_state="1">
+    <field name="name"/>
+    <field name="balance"/>
+    <field name="currency"/>
+    <field name="state"/>
+    <field name="parent" tree_invisible="1"/>
+    <field name="childs" tree_invisible="1"/>
+</tree>

view/cashbook_line_context_form.xml

@@ -2,20 +2,14 @@
 <!-- This file is part of the cashbook-module from m-ds for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
-<form col="10">
-    <label name="cashbook"/>
-    <field name="cashbook" widget="selection"/>
-
+<form col="8">
     <label name="date_from"/>
     <field name="date_from"/>
     <label name="date_to"/>
     <field name="date_to"/>
-
     <label name="checked"/>
     <field name="checked"/>
     <label name="done"/>
     <field name="done"/>
-
-    <field name="num_cashbook"/>
 </form>
 

view/category_form.xml

@@ -2,25 +2,22 @@
 <!-- This file is part of the cashbook-module from m-ds for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
-<form col="6">
+<form col="4">
     <label name="name"/>
     <field name="name"/>
     <label name="cattype"/>
     <field name="cattype"/>
-    <label id="phaccount" colspan="2" string=" "/>
 
     <label name="description"/>
-    <field name="description" colspan="5"/>
+    <field name="description" colspan="3"/>
 
-    <notebook colspan="6">
-        <page string="General Information" id="general" col="6">
+    <notebook colspan="4">
+        <page string="General Information" id="general" col="4">
             <label name="company"/>
             <field name="company"/>
             <label name="parent"/>
             <field name="parent"/>
-            <label name="sequence"/>
-            <field name="sequence"/>
-            <field name="childs" colspan="6"/>
+            <field name="childs" colspan="4"/>
         </page>
     </notebook>
 

view/category_list.xml

@@ -2,8 +2,6 @@
 <!-- This file is part of the cashbook-module from m-ds for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
-<tree sequence="sequence">
+<tree>
     <field name="rec_name"/>
-    <field name="cattype"/>
-    <field name="sequence" tree_invisible="1"/>
 </tree>

view/category_tree.xml

@@ -2,10 +2,8 @@
 <!-- This file is part of the cashbook-module from m-ds for Tryton.
 The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
-<tree sequence="sequence">
+<tree >
     <field name="name"/>
-    <field name="cattype"/>
-    <field name="sequence" tree_invisible="1"/>
     <field name="parent" tree_invisible="1"/>
     <field name="childs" tree_invisible="1"/>
 </tree>

view/configuration_form.xml

@@ -12,6 +12,22 @@ this repository contains the full copyright notices and license terms. -->
     <label name="done"/>
     <field name="done"/>
 
+    <separator id="sepenterbook" colspan="4" string="Enter Booking Wizard"/>
+    <label name="defbook"/>
+    <field name="defbook"/>
+    <label name="book1"/>
+    <field name="book1"/>
+
+    <label name="book2"/>
+    <field name="book2"/>
+    <label name="book3"/>
+    <field name="book3"/>
+
+    <label name="book4"/>
+    <field name="book4"/>
+    <label name="book5"/>
+    <field name="book5"/>
+
     <separator id="sepcb" colspan="4" string="Cashbook"/>
     <label name="catnamelong"/>
     <field name="catnamelong"/>

view/enterbooking_start_form.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- This file is part of the cashbook-module from m-ds for Tryton.
+The COPYRIGHT file at the top level of this repository contains the
+full copyright notices and license terms. -->
+<form col="2">
+    <label name="cashbook"/>
+    <field name="cashbook" widget="selection"/>
+
+    <notebook colspan="2">
+        <page id="general" string="Booking" col="2">
+            <label name="bookingtype"/>
+            <field name="bookingtype"/>
+            <label name="amount"/>
+            <field name="amount" symbol="currency"/>
+            <label name="category"/>
+            <field name="category"/>
+            <label name="booktransf"/>
+            <field name="booktransf"/>
+            <label name="party"/>
+            <field name="party"/>
+        </page>
+        <page id="descr" string="Description" col="1">
+            <field name="description"/>
+        </page>
+    </notebook>
+
+    <field name="cashbooks"/>
+    <field name="currency_digits"/>
+    <field name="currency"/>
+    <field name="owner_cashbook"/>
+</form>
+

view/line_form.xml

@@ -14,6 +14,7 @@ full copyright notices and license terms. -->
     <group id="grpstate" col="2">
         <button name="wfedit"/>
         <button name="wfcheck"/>
+        <button name="wfrecon"/>
     </group>
 
     <label name="date"/>
@@ -34,8 +35,15 @@ full copyright notices and license terms. -->
     <label name="category"/>
     <field name="category"/>
     <newline/>
+
     <label name="booktransf"/>
-    <field name="booktransf"/>
+    <field name="booktransf" colspan="3"/>
+    <newline/>
+
+    <label name="amount_2nd_currency"/>
+    <field name="amount_2nd_currency" symbol="currency2nd"/>
+    <label name="rate_2nd_currency"/>
+    <field name="rate_2nd_currency"/>
     <newline/>
 
     <notebook colspan="6">

view/line_list.xml

@@ -8,11 +8,10 @@ full copyright notices and license terms. -->
     <field name="date"/>
     <field name="payee"/>
     <field name="category_view"/>
-    <field name="description" expand="1"/>
+    <field name="descr_short" expand="1"/>
     <field name="credit" sum="Credit"/>
     <field name="debit" sum="Debit"/>
     <field name="balance"/>
-    <field name="currency"/>
     <field name="state"/>
     <button name="wfedit"/>
     <button name="wfcheck"/>

view/line_recon_list.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- This file is part of the cashbook-module from m-ds for Tryton.
+The COPYRIGHT file at the top level of this repository contains the
+full copyright notices and license terms. -->
+<tree>
+    <field name="cashbook" tree_invisible="1"/>
+    <field name="number"/>
+    <field name="date"/>
+    <field name="payee"/>
+    <field name="category_view"/>
+    <field name="descr_short" expand="1"/>
+    <field name="credit" sum="Credit"/>
+    <field name="debit" sum="Debit"/>
+    <field name="state"/>
+    <button name="wfrecon"/>
+</tree>

view/recon_form.xml

@@ -31,5 +31,6 @@ full copyright notices and license terms. -->
     <field name="date"/>
     <newline/>
 
-    <field name="lines" colspan="6"/>
+    <field name="lines" colspan="6"
+        view_ids="cashbook.line_recon_view_list,cashbook.line_view_form"/>
 </form>

view/split_form.xml

@@ -5,14 +5,26 @@ full copyright notices and license terms. -->
 <form col="4">
 
     <label name="line"/>
-    <field name="line" colspan="3"/>
+    <field name="line" colspan="5"/>
 
     <label name="amount"/>
     <field name="amount" symbol="currency"/>
-    <label name="category"/>
-    <field name="category"/>
+    <label name="splittype"/>
+    <field name="splittype"/>
 
-    <group name="description" colspan="4" col="1" string="Description" yexpand="1">
-        <field name="description" yfill="1"/>
-    </group>
+    <label name="category"/>
+    <field name="category" colspan="3"/>
+    <label name="booktransf"/>
+    <field name="booktransf" colspan="3"/>
+
+    <label name="amount_2nd_currency"/>
+    <field name="amount_2nd_currency" symbol="currency2nd"/>
+    <label name="rate_2nd_currency"/>
+    <field name="rate_2nd_currency"/>
+
+    <notebook colspan="4">
+        <page name="description" col="1" string="Description">
+            <field name="description"/>
+        </page>
+    </notebook>
 </form>

view/split_list.xml

@@ -4,8 +4,12 @@ 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="splittype"/>
     <field name="category"/>
+    <field name="booktransf"/>
     <field name="description" expand="1"/>
     <field name="amount" sum="Amount"/>
     <field name="currency"/>
+    <field name="amount_2nd_currency"/>
+    <field name="currency2nd"/>
 </tree>

wizard_booking.py

@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+# This file is part of the cashbook-module from m-ds 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
+from decimal import Decimal
+from .line import sel_bookingtype
+
+sel_booktypewiz = [x for x in sel_bookingtype if not x[0] in ['spin', 'spout']]
+
+
+class EnterBookingStart(ModelView):
+    'Enter Booking'
+    __name__ = 'cashbook.enterbooking.start'
+
+    cashbook = fields.Many2One(string='Cashbook', model_name='cashbook.book',
+        domain=[('id', 'in', Eval('cashbooks', [])), ('btype', '!=', None)],
+        depends=['cashbooks'], required=True)
+    cashbooks = fields.One2Many(string='Cashbooks', field=None,
+        model_name='cashbook.book', readonly=True,
+        states={'invisible': True})
+    owner_cashbook = fields.Function(fields.Many2One(string='Owner', readonly=True,
+        states={'invisible': True}, model_name='res.user'),
+        'on_change_with_owner_cashbook')
+    currency = fields.Function(fields.Many2One(string='Currency',
+        model_name='currency.currency', states={'invisible': True}),
+        'on_change_with_currency')
+    currency_digits = fields.Function(fields.Integer(string='Currency Digits',
+        readonly=True, states={'invisible': True}),
+        'on_change_with_currency_digits')
+    bookingtype = fields.Selection(string='Type', required=True,
+        selection=sel_booktypewiz)
+    amount =  fields.Numeric(string='Amount',
+        depends=['currency_digits', 'bookingtype'],
+        digits=(16, Eval('currency_digits', 2)), required=True,
+        domain=[('amount', '>=', Decimal('0.0'))])
+    description = fields.Text(string='Description')
+    category = fields.Many2One(string='Category',
+        model_name='cashbook.category', depends=['bookingtype'],
+        states={
+            'readonly': Bool(Eval('bookingtype')) == False,
+            'required': Eval('bookingtype', '').in_(['in', 'out']),
+            'invisible': ~Eval('bookingtype', '').in_(['in', 'out']),
+        },
+        domain=[
+            If(
+                Eval('bookingtype', '').in_(['in', 'mvin']),
+                ('cattype', '=', 'in'),
+                ('cattype', '=', 'out'),
+            )])
+
+    # party or cashbook as counterpart
+    booktransf = fields.Many2One(string='Source/Dest',
+        model_name='cashbook.book',
+        domain=[
+            ('owner.id', '=', Eval('owner_cashbook', -1)),
+            ('id', '!=', Eval('cashbook', -1)),
+            ],
+        states={
+            'invisible': ~Eval('bookingtype', '').in_(['mvin', 'mvout']),
+            'required': Eval('bookingtype', '').in_(['mvin', 'mvout']),
+        }, depends=['bookingtype', 'owner_cashbook', 'cashbook'])
+    party = fields.Many2One(string='Party', model_name='party.party',
+        states={
+            'invisible': ~Eval('bookingtype', '').in_(['in', 'out']),
+        }, depends=['bookingtype'])
+
+    @fields.depends('bookingtype', 'category')
+    def on_change_bookingtype(self):
+        """ clear category if not valid type
+        """
+        types = {
+            'in': ['in', 'mvin'],
+            'out': ['out', 'mvout'],
+            }
+
+        if self.bookingtype:
+            if self.category:
+                if not self.bookingtype in types.get(self.category.cattype, ''):
+                    self.category = None
+
+    @fields.depends('cashbook', '_parent_cashbook.owner')
+    def on_change_with_owner_cashbook(self, name=None):
+        """ get current owner
+        """
+        if self.cashbook:
+            return self.cashbook.owner.id
+
+    @fields.depends('cashbook', '_parent_cashbook.currency')
+    def on_change_with_currency(self, name=None):
+        """ digits
+        """
+        if self.cashbook:
+            return self.cashbook.currency.id
+
+    @fields.depends('cashbook', '_parent_cashbook.currency')
+    def on_change_with_currency_digits(self, name=None):
+        """ digits
+        """
+        if self.cashbook:
+            return self.cashbook.currency.digits
+        else :
+            return 2
+
+# end EnterBookingStart
+
+
+class EnterBookingWizard(Wizard):
+    'Enter Booking'
+    __name__ = 'cashbook.enterbooking'
+
+    start_state = 'start'
+    start = StateView('cashbook.enterbooking.start',
+        'cashbook.enterbooking_start_form', [
+            Button('Cancel', 'end', 'tryton-cancel'),
+            Button('Save', 'save_', 'tryton-save', default=True),
+            Button('Save & Next', 'savenext_', 'tryton-forward'),
+            ])
+    save_ = StateTransition()
+    savenext_ = StateTransition()
+
+    def default_start(self, fields):
+        """ setup form
+        """
+        pool = Pool()
+        Cashbook = pool.get('cashbook.book')
+        Configuration = pool.get('cashbook.configuration')
+
+        cfg1 = Configuration.get_singleton()
+
+        book_ids = []
+        for x in ['defbook', 'book1', 'book2', 'book3', 'book4', 'book5']:
+            if getattr(cfg1, x, None) is not None:
+                book_ids.append(getattr(cfg1, x, None).id)
+
+        result = {
+            'cashbooks': [x.id for x in Cashbook.search([
+                    ('state', '=', 'open'),
+                    ('btype', '!=', None),
+                    ('owner.id', '=', Transaction().user),
+                    ('id', 'in', book_ids),
+                ])],
+            'bookingtype': getattr(self.start, 'bookingtype', 'out'),
+            'cashbook': getattr(getattr(cfg1, 'defbook', None), 'id', None),
+            'amount': None,
+            'party': None,
+            'booktransf': None,
+            'description': None,
+            'category': None,
+            }
+        return result
+
+    def transition_save_(self):
+        """ store booking
+        """
+        pool = Pool()
+        Line = pool.get('cashbook.line')
+        IrDate = pool.get('ir.date')
+
+        query = {
+            'cashbook': self.start.cashbook.id,
+            'description': self.start.description,
+            'date': IrDate.today(),
+            'bookingtype': self.start.bookingtype,
+            'amount': self.start.amount,
+            }
+
+        if self.start.bookingtype in ['in', 'out']:
+            query['category'] = self.start.category.id
+            query['party'] = getattr(self.start.party, 'id', None)
+        elif self.start.bookingtype in ['mvin', 'mvout']:
+            query['booktransf'] = self.start.booktransf.id
+
+        Line.create([query])
+        return 'end'
+
+    def transition_savenext_(self):
+        """ store booking & restart
+        """
+        self.transition_save_()
+        return 'start'
+
+# end EnterBookingWizard

wizard_booking.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- This file is part of the cashbook-module from m-ds for Tryton.
+The COPYRIGHT file at the top level of this repository contains the
+full copyright notices and license terms. -->
+<tryton>
+    <data>
+
+        <record model="ir.ui.view" id="enterbooking_start_form">
+            <field name="model">cashbook.enterbooking.start</field>
+            <field name="type">form</field>
+            <field name="name">enterbooking_start_form</field>
+        </record>
+
+        <!-- enter booking -->
+        <record model="ir.action.wizard" id="act_enterbooking_wiz">
+            <field name="name">Enter Booking</field>
+            <field name="wiz_name">cashbook.enterbooking</field>
+        </record>
+
+    </data>
+</tryton>

wizard_openline.py

@@ -8,15 +8,42 @@ from trytond.pyson import PYSONEncoder
 from trytond.wizard import Wizard, StateView, StateTransition, StateAction, Button
 from trytond.i18n import gettext
 from trytond.pool import Pool
+from trytond.exceptions import UserError
 from trytond.transaction import Transaction
 
 
+class OLineMixin:
+    """ mixin to extend action-data
+    """
+    def add_action_data(self, book):
+        """ add book and cfg
+        """
+        Configuration = Pool().get('cashbook.configuration')
+        cfg1 = Configuration.get_singleton()
+        action = {
+            'pyson_context': PYSONEncoder().encode({
+                'cashbook': getattr(book, 'id', None),
+                'date_from': getattr(cfg1, 'date_from', None),
+                'date_to': getattr(cfg1, 'date_to', None),
+                'checked': getattr(cfg1, 'checked', None),
+                'done': getattr(cfg1, 'done', None),
+                }),
+            'name' : '%(name)s: %(cashbook)s' % {
+                'name': gettext('cashbook.msg_name_cashbook'),
+                'cashbook': getattr(book, 'rec_name', '-/-'),
+                },
+            }
+        return action
+
+# OLineMixin
+
+
 class OpenCashBookStart(ModelView):
     'Open Cashbook'
     __name__ = 'cashbook.open_lines.start'
 
     cashbook = fields.Many2One(string='Cashbook', model_name='cashbook.book',
-        required=True)
+        required=True, domain=[('btype', '!=', None)])
     checked = fields.Boolean(string='Checked', help="Show cashbook lines in Checked-state.")
     done = fields.Boolean(string='Done', help="Show cashbook lines in Done-state")
     date_from = fields.Date(string='Start Date')
@@ -33,7 +60,7 @@ class OpenCashBookStart(ModelView):
 # end OpenCashBookStart
 
 
-class OpenCashBook(Wizard):
+class OpenCashBook(OLineMixin, Wizard):
     'Open Cashbook'
     __name__ = 'cashbook.open_lines'
 
@@ -44,7 +71,7 @@ class OpenCashBook(Wizard):
             Button('Cancel', 'end', 'tryton-cancel'),
             Button('Open', 'open_', 'tryton-ok', default=True),
             ])
-    open_ = StateAction('cashbook.act_line_view')
+    open_ = StateAction('cashbook.act_line_view2')
 
     def transition_check(self):
         """ dont ask and open cashbook if user has 1x only
@@ -54,7 +81,7 @@ class OpenCashBook(Wizard):
         with Transaction().set_context({
             '_check_access': True,
             }):
-            books = Book.search([])
+            books = Book.search([('btype', '!=', None)])
             if len(books) == 1:
                 return 'open_'
         return 'askuser'
@@ -90,36 +117,60 @@ class OpenCashBook(Wizard):
             with Transaction().set_context({
                 '_check_access': True,
                 }):
-                books = Book.search([])
+                books = Book.search([('btype', '!=', None)])
                 if len(books) > 0:
                     book = books[0]
 
-        date_from = getattr(self.askuser, 'date_from', None)
-        date_to = getattr(self.askuser, 'date_to', None)
-        checked = getattr(self.askuser, 'checked', True)
-        done = getattr(self.askuser, 'done', False)
-
         # save settings
-        cfg1.date_from = date_from
-        cfg1.date_to = date_to
-        cfg1.checked = checked
-        cfg1.done = done
+        cfg1.date_from = getattr(self.askuser, 'date_from', None)
+        cfg1.date_to = getattr(self.askuser, 'date_to', None)
+        cfg1.checked = getattr(self.askuser, 'checked', True)
+        cfg1.done = getattr(self.askuser, 'done', False)
         cfg1.save()
-
-        action['pyson_context'] = PYSONEncoder().encode({
-            'cashbook': getattr(book, 'id', None),
-            'date_from': date_from,
-            'date_to': date_to,
-            'checked': checked,
-            'done': done,
-            })
-        action['name'] = '%(name)s: %(cashbook)s' % {
-                'name': gettext('cashbook.msg_name_cashbook'),
-                'cashbook': getattr(book, 'rec_name', '-/-'),
-            }
+        action.update(self.add_action_data(book))
         return action, {}
 
     def transition_open_(self):
         return 'end'
 
 # end OpenCashBook
+
+
+class OpenCashBookTree(OLineMixin, Wizard):
+    'Open Cashbook2'
+    __name__ = 'cashbook.open_lines_tree'
+
+    start_state = 'open_'
+    open_ = StateAction('cashbook.act_line_view2')
+
+    def do_open_(self, action):
+        """ open view from doubleclick
+        """
+        pool = Pool()
+        Book = pool.get('cashbook.book')
+        Configuration = pool.get('cashbook.configuration')
+
+        cfg1 = Configuration.get_singleton()
+        if cfg1 is None:
+            cfg1 = Configuration()
+            cfg1.save()
+
+        book = self.record
+        if book is None:
+            with Transaction().set_context({
+                '_check_access': True,
+                }):
+                books = Book.search([('btype', '!=', None)])
+                if len(books) > 0:
+                    book = books[0]
+        else :
+            if book.btype is None:
+                raise UserError(gettext(
+                    'cashbook.msg_book_no_type_noopen',
+                    bookname = book.rec_name,
+                    ))
+
+        action.update(self.add_action_data(book))
+        return action, {}
+
+# end OpenCashBookTree

wizard_openline.xml

@@ -17,5 +17,24 @@ full copyright notices and license terms. -->
             <field name="wiz_name">cashbook.open_lines</field>
         </record>
 
+        <!-- open line view by double click at cashbook -->
+        <record model="ir.action.wizard" id="act_open_tree_lines">
+            <field name="name">Open Cashbook</field>
+            <field name="wiz_name">cashbook.open_lines_tree</field>
+            <field name="model">cashbook.book</field>
+        </record>
+
+        <record model="ir.action.keyword" id="act_open_tree_lines_keyword2">
+            <field name="keyword">form_action</field>
+            <field name="model">cashbook.book,-1</field>
+            <field name="action" ref="act_open_tree_lines"/>
+        </record>
+
+        <record model="ir.action.keyword" id="act_open_tree_lines_keyword3">
+            <field name="keyword">tree_open</field>
+            <field name="model">cashbook.book,-1</field>
+            <field name="action" ref="act_open_tree_lines"/>
+        </record>
+
     </data>
 </tryton>