line: amount darf negativ sein + test, constrain gelöscht
This commit is contained in:
parent
e3887debe9
commit
9732fe11e9
5 changed files with 154 additions and 19 deletions
16
line.py
16
line.py
|
@ -91,8 +91,7 @@ class Line(Workflow, ModelSQL, ModelView):
|
|||
STATES['readonly'],
|
||||
Eval('bookingtype', '').in_(['spin', 'spout']),
|
||||
),
|
||||
}, depends=DEPENDS+['currency_digits', 'bookingtype'],
|
||||
domain=[('amount', '>=', Decimal('0.0'))])
|
||||
}, depends=DEPENDS+['currency_digits', 'bookingtype'])
|
||||
debit = fields.Numeric(string='Debit', digits=(16, Eval('currency_digits', 2)),
|
||||
required=True, readonly=True, depends=['currency_digits'])
|
||||
credit = fields.Numeric(string='Credit', digits=(16, Eval('currency_digits', 2)),
|
||||
|
@ -174,6 +173,13 @@ 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')
|
||||
|
||||
@classmethod
|
||||
def __setup__(cls):
|
||||
super(Line, cls).__setup__()
|
||||
|
@ -184,9 +190,6 @@ class Line(Workflow, ModelSQL, ModelView):
|
|||
('state_val',
|
||||
Check(t, t.state.in_(['edit', 'check', 'done'])),
|
||||
'cashbook.msg_line_wrong_state_value'),
|
||||
('amount_val',
|
||||
Check(t, t.amount >= Decimal('0.0')),
|
||||
'cashbook.msg_line_must_positive'),
|
||||
])
|
||||
cls._transitions |= set((
|
||||
('edit', 'check'),
|
||||
|
@ -351,11 +354,10 @@ class Line(Workflow, ModelSQL, ModelView):
|
|||
def search_rec_name(cls, name, clause):
|
||||
""" search in description +...
|
||||
"""
|
||||
l1 = cls.search_payee(name, clause) + [
|
||||
return cls.search_payee(name, clause) + [
|
||||
('description',) + tuple(clause[1:]),
|
||||
('category.rec_name',) + tuple(clause[1:]),
|
||||
]
|
||||
return l1
|
||||
|
||||
def get_rec_name(self, name):
|
||||
""" short + name
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue