diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index c22da993912..3fca0c34440 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -28,7 +28,7 @@ bank statements from coda files. """, "depends":["base", "account"], - "demo_xml":["coda_demo.xml"], + "demo_xml":["account_coda_demo.xml"], "init_xml":[], "update_xml" : ["security/ir.model.access.csv", "wizard/account_coda_import.xml", diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index b7f03ba9a6d..50540e31e65 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -24,7 +24,6 @@ - account.coda.tree account.coda @@ -34,22 +33,48 @@ + + + account.coda.select + account.coda + search + + + + + + + + + + + + + + + + + + Coda import ir.actions.act_window account.coda form tree,form + - + + + - + - - - - - - diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py index f7945084f03..b5331eacf45 100644 --- a/addons/account_coda/wizard/account_coda_import.py +++ b/addons/account_coda/wizard/account_coda_import.py @@ -48,7 +48,7 @@ class account_coda_import(osv.osv_memory): _columns = { 'journal_id': fields.many2one('account.journal', 'Bank Journal', required=True), 'def_payable': fields.many2one('account.account', 'Default Payable Account',domain=[('type','=','payable')],required=True,help= 'Set here the payable account that will be used, by default, if the partner is not found'), - 'def_receivable': fields.many2one('account.account', 'Default receivable Account',domain=[('type','=','receivable')],required=True,help= 'Set here the receivable account that will be used, by default, if the partner is not found',), + 'def_receivable': fields.many2one('account.account', 'Default Receivable Account',domain=[('type','=','receivable')],required=True,help= 'Set here the receivable account that will be used, by default, if the partner is not found',), 'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement',required=True,help= 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled',), 'coda': fields.binary('Coda File', required=True), 'note':fields.text('Log'), diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml index fcfa580d077..0eb06d90b86 100644 --- a/addons/account_coda/wizard/account_coda_import.xml +++ b/addons/account_coda/wizard/account_coda_import.xml @@ -7,7 +7,7 @@ form
- + @@ -52,15 +52,6 @@ new - +