From 3e4eb1095838e907b8007fdace776cd63b294bea Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 24 Dec 2013 19:16:40 +0100 Subject: [PATCH 1/3] [IMP] account_statement_base_import: private method that returns import type to ease inheritance [IMP] account_statement_ofx_import: changed accordingly previous improvement --- account_statement_base_import/statement.py | 9 +++++---- account_statement_ofx_import/statement.py | 13 +------------ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/account_statement_base_import/statement.py b/account_statement_base_import/statement.py index 97e8e8ab..e2057bc2 100644 --- a/account_statement_base_import/statement.py +++ b/account_statement_base_import/statement.py @@ -31,12 +31,13 @@ from parser import new_bank_statement_parser class AccountStatementProfil(Model): _inherit = "account.statement.profile" - def get_import_type_selection(self, cr, uid, context=None): - """ - Has to be inherited to add parser - """ + def _get_import_type_selection(self, cr, uid, context=None): + """This is the method to be inherited for adding the parser""" return [('generic_csvxls_so', 'Generic .csv/.xls based on SO Name')] + def get_import_type_selection(self, cr, uid, context=None): + return _get_import_type selection(cr, uid, context=context) + _columns = { 'launch_import_completion': fields.boolean( "Launch completion after import", diff --git a/account_statement_ofx_import/statement.py b/account_statement_ofx_import/statement.py index c5b06fe8..bc31980a 100644 --- a/account_statement_ofx_import/statement.py +++ b/account_statement_ofx_import/statement.py @@ -24,7 +24,7 @@ from openerp.osv import fields, orm class AccountStatementProfil(orm.Model): _inherit = "account.statement.profile" - def get_import_type_selection(self, cr, uid, context=None): + def _get_import_type_selection(self, cr, uid, context=None): """ Inherited from parent to add parser. """ @@ -33,14 +33,3 @@ class AccountStatementProfil(orm.Model): context=context) selection.append(('ofx_so', _('OFX - Open Financial Exchange'))) return selection - - _columns = { - 'import_type': fields.selection( - get_import_type_selection, - 'Type of import', - required=True, - help="Choose here the method by which you want to import bank" - "statement for this profile."), - - } - From 3f1999ed8cea4d6ba273d486e8414f23dd2971df Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 21 Jan 2014 02:04:59 +0100 Subject: [PATCH 2/3] [IMP] account_statement_base_import: Inheritable method with public name. --- account_statement_base_import/statement.py | 9 ++++----- account_statement_ofx_import/statement.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/account_statement_base_import/statement.py b/account_statement_base_import/statement.py index e2057bc2..3dbddd60 100644 --- a/account_statement_base_import/statement.py +++ b/account_statement_base_import/statement.py @@ -31,12 +31,12 @@ from parser import new_bank_statement_parser class AccountStatementProfil(Model): _inherit = "account.statement.profile" - def _get_import_type_selection(self, cr, uid, context=None): + def get_import_type_selection(self, cr, uid, context=None): """This is the method to be inherited for adding the parser""" return [('generic_csvxls_so', 'Generic .csv/.xls based on SO Name')] - def get_import_type_selection(self, cr, uid, context=None): - return _get_import_type selection(cr, uid, context=context) + def _get_import_type_selection(self, cr, uid, context=None): + return get_import_type selection(cr, uid, context=context) _columns = { 'launch_import_completion': fields.boolean( @@ -47,12 +47,11 @@ class AccountStatementProfil(Model): # we remove deprecated as it floods logs in standard/warning level sob... 'rec_log': fields.text('log', readonly=True), # Deprecated 'import_type': fields.selection( - get_import_type_selection, + _get_import_type_selection, 'Type of import', required=True, help="Choose here the method by which you want to import bank" "statement for this profile."), - } def _write_extra_statement_lines( diff --git a/account_statement_ofx_import/statement.py b/account_statement_ofx_import/statement.py index bc31980a..15060360 100644 --- a/account_statement_ofx_import/statement.py +++ b/account_statement_ofx_import/statement.py @@ -24,7 +24,7 @@ from openerp.osv import fields, orm class AccountStatementProfil(orm.Model): _inherit = "account.statement.profile" - def _get_import_type_selection(self, cr, uid, context=None): + def get_import_type_selection(self, cr, uid, context=None): """ Inherited from parent to add parser. """ From 51c76544454b4dcf0609eed95b6e2cdf36cc5960 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 24 Feb 2014 23:45:29 +0100 Subject: [PATCH 3/3] [FIX] account_statement_base_import: self reference calling method. --- account_statement_base_import/statement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_statement_base_import/statement.py b/account_statement_base_import/statement.py index 3dbddd60..3ad5dbe4 100644 --- a/account_statement_base_import/statement.py +++ b/account_statement_base_import/statement.py @@ -36,7 +36,7 @@ class AccountStatementProfil(Model): return [('generic_csvxls_so', 'Generic .csv/.xls based on SO Name')] def _get_import_type_selection(self, cr, uid, context=None): - return get_import_type selection(cr, uid, context=context) + return self.get_import_type_selection(cr, uid, context=context) _columns = { 'launch_import_completion': fields.boolean(