state reconcile begonnen
This commit is contained in:
parent
fc3ddba3ab
commit
63a3f8f020
4 changed files with 28 additions and 3 deletions
21
line.py
21
line.py
|
@ -26,6 +26,7 @@ sel_payee = [
|
||||||
sel_linetype = [
|
sel_linetype = [
|
||||||
('edit', 'Edit'),
|
('edit', 'Edit'),
|
||||||
('check', 'Checked'),
|
('check', 'Checked'),
|
||||||
|
('recon', 'Reconciled'),
|
||||||
('done', 'Done'),
|
('done', 'Done'),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -197,7 +198,9 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
|
||||||
])
|
])
|
||||||
cls._transitions |= set((
|
cls._transitions |= set((
|
||||||
('edit', 'check'),
|
('edit', 'check'),
|
||||||
('check', 'done'),
|
('check', 'recon'),
|
||||||
|
('recon', 'done'),
|
||||||
|
('recon', 'check'),
|
||||||
('check', 'edit'),
|
('check', 'edit'),
|
||||||
))
|
))
|
||||||
cls._buttons.update({
|
cls._buttons.update({
|
||||||
|
@ -207,11 +210,15 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
|
||||||
'depends': ['state', 'reference'],
|
'depends': ['state', 'reference'],
|
||||||
},
|
},
|
||||||
'wfcheck': {
|
'wfcheck': {
|
||||||
'invisible': Eval('state') != 'edit',
|
'invisible': ~Eval('state', '').in_(['edit', 'recon']),
|
||||||
|
'depends': ['state'],
|
||||||
|
},
|
||||||
|
'wfrecon': {
|
||||||
|
'invisible': Eval('state') != 'check',
|
||||||
'depends': ['state'],
|
'depends': ['state'],
|
||||||
},
|
},
|
||||||
'wfdone': {
|
'wfdone': {
|
||||||
'invisible': Eval('state') != 'check',
|
'invisible': Eval('state') != 'recon',
|
||||||
'depends': ['state'],
|
'depends': ['state'],
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@ -396,6 +403,14 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
|
||||||
new_lines = Line2.create(to_create_line)
|
new_lines = Line2.create(to_create_line)
|
||||||
Line2.wfcheck(new_lines)
|
Line2.wfcheck(new_lines)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
@ModelView.button
|
||||||
|
@Workflow.transition('recon')
|
||||||
|
def wfrecon(cls, lines):
|
||||||
|
""" line is reconciled
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@ModelView.button
|
@ModelView.button
|
||||||
@Workflow.transition('done')
|
@Workflow.transition('done')
|
||||||
|
|
|
@ -674,6 +674,10 @@ msgctxt "selection:cashbook.split,state:"
|
||||||
msgid "Checked"
|
msgid "Checked"
|
||||||
msgstr "Geprüft"
|
msgstr "Geprüft"
|
||||||
|
|
||||||
|
msgctxt "selection:cashbook.split,state:"
|
||||||
|
msgid "Reconciled"
|
||||||
|
msgstr "Abgeglichen"
|
||||||
|
|
||||||
msgctxt "selection:cashbook.split,state:"
|
msgctxt "selection:cashbook.split,state:"
|
||||||
msgid "Done"
|
msgid "Done"
|
||||||
msgstr "Fertig"
|
msgstr "Fertig"
|
||||||
|
@ -806,6 +810,10 @@ msgctxt "selection:cashbook.line,state:"
|
||||||
msgid "Checked"
|
msgid "Checked"
|
||||||
msgstr "Geprüft"
|
msgstr "Geprüft"
|
||||||
|
|
||||||
|
msgctxt "selection:cashbook.line,state:"
|
||||||
|
msgid "Reconciled"
|
||||||
|
msgstr "Abgeglichen"
|
||||||
|
|
||||||
msgctxt "selection:cashbook.line,state:"
|
msgctxt "selection:cashbook.line,state:"
|
||||||
msgid "Done"
|
msgid "Done"
|
||||||
msgstr "Fertig"
|
msgstr "Fertig"
|
||||||
|
|
|
@ -14,6 +14,7 @@ full copyright notices and license terms. -->
|
||||||
<group id="grpstate" col="2">
|
<group id="grpstate" col="2">
|
||||||
<button name="wfedit"/>
|
<button name="wfedit"/>
|
||||||
<button name="wfcheck"/>
|
<button name="wfcheck"/>
|
||||||
|
<button name="wfrecon"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<label name="date"/>
|
<label name="date"/>
|
||||||
|
|
|
@ -15,4 +15,5 @@ full copyright notices and license terms. -->
|
||||||
<field name="state"/>
|
<field name="state"/>
|
||||||
<button name="wfedit"/>
|
<button name="wfedit"/>
|
||||||
<button name="wfcheck"/>
|
<button name="wfcheck"/>
|
||||||
|
<button name="wfrecon"/>
|
||||||
</tree>
|
</tree>
|
||||||
|
|
Loading…
Reference in a new issue