From 403729d75f56b09c756d65060a083a364a506fe0 Mon Sep 17 00:00:00 2001 From: Frederik Jaeckel Date: Wed, 16 Nov 2022 18:02:58 +0100 Subject: [PATCH] state reconcile begonnen --- line.py | 21 ++++++++++++++++++--- locale/de.po | 8 ++++++++ view/line_form.xml | 1 + view/line_list.xml | 1 + 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/line.py b/line.py index 3841bde..dc1fc0d 100644 --- a/line.py +++ b/line.py @@ -26,6 +26,7 @@ sel_payee = [ sel_linetype = [ ('edit', 'Edit'), ('check', 'Checked'), + ('recon', 'Reconciled'), ('done', 'Done'), ] @@ -197,7 +198,9 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView): ]) cls._transitions |= set(( ('edit', 'check'), - ('check', 'done'), + ('check', 'recon'), + ('recon', 'done'), + ('recon', 'check'), ('check', 'edit'), )) cls._buttons.update({ @@ -207,11 +210,15 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView): 'depends': ['state', 'reference'], }, 'wfcheck': { - 'invisible': Eval('state') != 'edit', + 'invisible': ~Eval('state', '').in_(['edit', 'recon']), + 'depends': ['state'], + }, + 'wfrecon': { + 'invisible': Eval('state') != 'check', 'depends': ['state'], }, 'wfdone': { - 'invisible': Eval('state') != 'check', + 'invisible': Eval('state') != 'recon', 'depends': ['state'], }, }) @@ -396,6 +403,14 @@ class Line(SecondCurrencyMixin, 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') diff --git a/locale/de.po b/locale/de.po index 4d5c973..1809f45 100644 --- a/locale/de.po +++ b/locale/de.po @@ -674,6 +674,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" @@ -806,6 +810,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" diff --git a/view/line_form.xml b/view/line_form.xml index df63ac9..260e500 100644 --- a/view/line_form.xml +++ b/view/line_form.xml @@ -14,6 +14,7 @@ full copyright notices and license terms. -->