[IMP] backport srijnhart@therp.nl's fixes concerning unsplitting

mutations for a unified user experience
This commit is contained in:
Holger Brunn
2013-04-25 15:27:09 +02:00
parent fb3a8ee4f9
commit 1b7efc9fe5
2 changed files with 7 additions and 11 deletions

View File

@@ -293,14 +293,11 @@
<field name="match_type"/>
<field name="residual"/>
<field name="parent_id" invisible="1" />
<button name="action_unlink"
string="Remove split transaction"
type="object"
icon="STOCK_REMOVE"
attrs="{'invisible': ['|', ('parent_id', '=', False), ('state', '!=', 'draft')]}" />
<button name="match_wizard" states="draft"
<button name="match_wizard"
string="Match"
icon="terp-gtk-jump-to-ltr"
attrs="{'invisible': ['|', ('parent_id', '!=', False),
('state', '!=', 'draft')]}"
type="object"/>
<field name="match_multi" invisible="1"/>
<field name="duplicate" invisible="1"/>
@@ -533,9 +530,12 @@
<field name="amount"/>
<field name="match_type"/>
<field name="residual"/>
<button name="match_wizard" states="draft"
<field name="parent_id" invisible="1" />
<button name="match_wizard"
string="Match"
icon="terp-gtk-jump-to-ltr"
attrs="{'invisible': ['|', ('parent_id', '!=', False),
('state', '!=', 'draft')]}"
type="object"/>
<field name="match_multi" invisible="1"/>
<field name="duplicate" invisible="1"/>

View File

@@ -1986,10 +1986,6 @@ class account_bank_statement_line(osv.osv):
return child_statement_ids
def action_unlink(self, cr, uid, ids, context=None):
self.unlink(cr, uid, ids, context=context)
return True
account_bank_statement_line()
class account_bank_statement(osv.osv):