[FIX] Duplicate statement line does not show up red on statement due to

color precendence
[FIX] Cannot cancel statement line
This commit is contained in:
Stefan Rijnhart
2012-05-02 16:28:52 +02:00
parent 7fa5c32b88
commit e155cb4773
2 changed files with 4 additions and 4 deletions

View File

@@ -192,7 +192,7 @@
<data>
<field name="period_id" position="replace"/>
<xpath expr="/form/notebook/page[@string='Transaction']/field/tree" position="attributes">
<attribute name="colors">black:state == 'confirmed';darkmagenta:match_multi == True;grey:state=='draft';crimson:duplicate == True;</attribute>
<attribute name="colors">black:state == 'confirmed';darkmagenta:match_multi == True;crimson:duplicate == True;grey:state == 'draft';</attribute>
</xpath>
<xpath expr="/form/notebook/page[@string='Transaction']/field/tree/field[@name='name']" position="replace">
<field name="name" required="1"/>

View File

@@ -766,10 +766,10 @@ class banking_import_transaction(osv.osv):
else:
account_id = journal.default_debit_account_id.id
cancel_line = False
move_lines = [
move_lines = []
for move in transaction.statement_line_id.move_ids:
# There should usually be just one move, I think
move.line_id for move in transaction.statement_line_id.move_ids
]
move_lines += move.line_id
for line in move_lines:
if line.account_id.id != account_id:
cancel_line = line