diff --git a/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py b/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py index 7c1165ed..c5feb2ac 100644 --- a/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py +++ b/account_advanced_reconcile_transaction_ref/base_advanced_reconciliation.py @@ -19,11 +19,10 @@ # ############################################################################## -from itertools import product from openerp.osv import orm -class easy_reconcile_advanced(orm.AbstractModel): +class EasyReconcileAdvanced(orm.AbstractModel): _inherit = 'easy.reconcile.advanced' diff --git a/account_easy_reconcile/easy_reconcile.py b/account_easy_reconcile/easy_reconcile.py index 105d06a4..99ed960f 100644 --- a/account_easy_reconcile/easy_reconcile.py +++ b/account_easy_reconcile/easy_reconcile.py @@ -19,9 +19,8 @@ # ############################################################################## -from openerp.osv import fields, osv, orm +from openerp.osv import fields, orm from openerp.tools.translate import _ -from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT class EasyReconcileOptions(orm.AbstractModel): diff --git a/account_easy_reconcile/security/ir.model.access.csv b/account_easy_reconcile/security/ir.model.access.csv index 96dd3137..616a6217 100644 --- a/account_easy_reconcile/security/ir.model.access.csv +++ b/account_easy_reconcile/security/ir.model.access.csv @@ -2,14 +2,8 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_easy_reconcile_options_acc_user,easy.reconcile.options,model_easy_reconcile_options,account.group_account_user,1,0,0,0 access_account_easy_reconcile_method_acc_user,account.easy.reconcile.method,model_account_easy_reconcile_method,account.group_account_user,1,0,0,0 access_account_easy_reconcile_acc_user,account.easy.reconcile,model_account_easy_reconcile,account.group_account_user,1,1,0,0 -access_easy_reconcile_simple_name_acc_user,easy.reconcile.simple.name,model_easy_reconcile_simple_name,account.group_account_user,1,0,0,0 -access_easy_reconcile_simple_partner_acc_user,easy.reconcile.simple.partner,model_easy_reconcile_simple_partner,account.group_account_user,1,0,0,0 -access_easy_reconcile_simple_reference_acc_user,easy.reconcile.simple.reference,model_easy_reconcile_simple_reference,account.group_account_user,1,0,0,0 access_easy_reconcile_options_acc_mgr,easy.reconcile.options,model_easy_reconcile_options,account.group_account_user,1,0,0,0 access_account_easy_reconcile_method_acc_mgr,account.easy.reconcile.method,model_account_easy_reconcile_method,account.group_account_user,1,1,1,1 access_account_easy_reconcile_acc_mgr,account.easy.reconcile,model_account_easy_reconcile,account.group_account_user,1,1,1,1 -access_easy_reconcile_simple_name_acc_mgr,easy.reconcile.simple.name,model_easy_reconcile_simple_name,account.group_account_user,1,0,0,0 -access_easy_reconcile_simple_partner_acc_mgr,easy.reconcile.simple.partner,model_easy_reconcile_simple_partner,account.group_account_user,1,0,0,0 -access_easy_reconcile_simple_reference_acc_mgr,easy.reconcile.simple.reference,model_easy_reconcile_simple_reference,account.group_account_user,1,0,0,0 access_easy_reconcile_history_acc_user,easy.reconcile.history,model_easy_reconcile_history,account.group_account_user,1,1,1,0 access_easy_reconcile_history_acc_mgr,easy.reconcile.history,model_easy_reconcile_history,account.group_account_manager,1,1,1,1 diff --git a/account_invoice_reference/account_move.py b/account_invoice_reference/account_move.py index 56226665..b99689b8 100644 --- a/account_invoice_reference/account_move.py +++ b/account_invoice_reference/account_move.py @@ -19,10 +19,10 @@ # ############################################################################## -from openerp.osv import orm, fields +from openerp.osv import orm -class account_move(orm.Model): +class AccountMove(orm.Model): _inherit = 'account.move' def create(self, cr, uid, vals, context=None): @@ -37,12 +37,12 @@ class account_move(orm.Model): cr, uid, invoice, context=context) vals = vals.copy() vals['ref'] = ref - move_id = super(account_move, self).\ - create(cr, uid, vals, context=context) + move_id = super(AccountMove, self).create(cr, uid, vals, + context=context) return move_id -class account_invoice(orm.Model): +class AccountInvoice(orm.Model): _inherit = 'account.invoice' def _ref_from_invoice(self, cr, uid, invoice, context=None): @@ -82,8 +82,8 @@ class account_invoice(orm.Model): if (vals.get('supplier_invoice_reference') and not vals.get('reference')): vals['reference'] = vals['supplier_invoice_reference'] - return super(account_invoice, self).create(cr, uid, vals, - context=context) + return super(AccountInvoice, self).create(cr, uid, vals, + context=context) def write(self, cr, uid, ids, vals, context=None): if vals.get('supplier_invoice_reference'): @@ -93,9 +93,9 @@ class account_invoice(orm.Model): if not invoice.reference: locvals = vals.copy() locvals['reference'] = vals['supplier_invoice_reference'] - super(account_invoice, self).write(cr, uid, [invoice.id], - locvals, context=context) + super(AccountInvoice, self).write(cr, uid, [invoice.id], + locvals, context=context) return True else: - return super(account_invoice, self).write(cr, uid, ids, vals, - context=context) + return super(AccountInvoice, self).write(cr, uid, ids, vals, + context=context) diff --git a/account_statement_base_completion/partner_view.xml b/account_statement_base_completion/partner_view.xml index c7ec3f1a..94be85c3 100644 --- a/account_statement_base_completion/partner_view.xml +++ b/account_statement_base_completion/partner_view.xml @@ -7,7 +7,6 @@ account_bank_statement_import.view.partner.form res.partner - form 20 @@ -17,6 +16,6 @@ - + diff --git a/account_statement_base_completion/statement_view.xml b/account_statement_base_completion/statement_view.xml index d5adaddc..f5d07bd5 100644 --- a/account_statement_base_completion/statement_view.xml +++ b/account_statement_base_completion/statement_view.xml @@ -7,7 +7,6 @@ account.bank.statement - form @@ -37,7 +36,6 @@ account_bank_statement_import_base.bank_statement.auto_cmpl account.bank.statement - form @@ -51,7 +49,6 @@ account.statement.profile.view account.statement.profile - form @@ -59,12 +56,11 @@ - - + + account.statement.completion.rule.view account.statement.completion.rule - form
@@ -79,7 +75,6 @@ account.statement.completion.rule.view account.statement.completion.rule - tree @@ -97,8 +92,8 @@ - + diff --git a/account_statement_base_import/parser/generic_file_parser.py b/account_statement_base_import/parser/generic_file_parser.py index 2ebea509..cad000a4 100644 --- a/account_statement_base_import/parser/generic_file_parser.py +++ b/account_statement_base_import/parser/generic_file_parser.py @@ -19,15 +19,8 @@ ############################################################################## from openerp.tools.translate import _ -import base64 -import csv -import tempfile import datetime from file_parser import FileParser -try: - import xlrd -except: - raise Exception(_('Please install python lib xlrd')) class GenericFileParser(FileParser): diff --git a/account_statement_base_import/statement_view.xml b/account_statement_base_import/statement_view.xml index ded05b28..b73e0dc7 100644 --- a/account_statement_base_import/statement_view.xml +++ b/account_statement_base_import/statement_view.xml @@ -7,7 +7,6 @@ account.statement.profile.view account.statement.profile - form @@ -31,7 +30,6 @@ account_bank_statement.bank_statement.view_form account.bank.statement - form diff --git a/account_statement_base_import/wizard/import_statement_view.xml b/account_statement_base_import/wizard/import_statement_view.xml index 51ec4740..7654e934 100644 --- a/account_statement_base_import/wizard/import_statement_view.xml +++ b/account_statement_base_import/wizard/import_statement_view.xml @@ -4,7 +4,6 @@ credit.statement.import.config.view credit.statement.import - form diff --git a/account_statement_commission/import_statement_view.xml b/account_statement_commission/import_statement_view.xml index 45413b4f..b325ed2d 100644 --- a/account_statement_commission/import_statement_view.xml +++ b/account_statement_commission/import_statement_view.xml @@ -4,7 +4,6 @@ credit.statement.import.config.view credit.statement.import - form diff --git a/account_statement_commission/statement_view.xml b/account_statement_commission/statement_view.xml index 7da6c27c..c990a9e5 100644 --- a/account_statement_commission/statement_view.xml +++ b/account_statement_commission/statement_view.xml @@ -6,7 +6,6 @@ account_bank_statement.bank_statement.view_form account.bank.statement - form diff --git a/account_statement_completion_label/partner_view.xml b/account_statement_completion_label/partner_view.xml index 9a7b35b3..6ed730dd 100644 --- a/account_statement_completion_label/partner_view.xml +++ b/account_statement_completion_label/partner_view.xml @@ -11,7 +11,6 @@ account_bank_statement_import.view.partner.form res.partner - form 20 @@ -23,7 +22,7 @@ - + diff --git a/account_statement_ext/account.py b/account_statement_ext/account.py index ecd1853c..ac8fefd2 100644 --- a/account_statement_ext/account.py +++ b/account_statement_ext/account.py @@ -19,23 +19,21 @@ # ############################################################################## -from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import orm -class account_move(Model): +class AccountMove(orm.Model): _inherit = 'account.move' def unlink(self, cr, uid, ids, context=None): - """ - Delete the reconciliation when we delete the moves. This + """Delete the reconciliation when we delete the moves. This allow an easier way of cancelling the bank statement. """ reconcile_to_delete = [] - reconcile_obj = self.pool.get('account.move.reconcile') + reconcile_obj = self.pool['account.move.reconcile'] for move in self.browse(cr, uid, ids, context=context): for move_line in move.line_id: if move_line.reconcile_id: reconcile_to_delete.append(move_line.reconcile_id.id) reconcile_obj.unlink(cr, uid, reconcile_to_delete, context=context) - return super(account_move, self).unlink(cr, uid, ids, context=context) + return super(AccountMove, self).unlink(cr, uid, ids, context=context) diff --git a/account_statement_ext/statement_view.xml b/account_statement_ext/statement_view.xml index 063ba92a..3896b2c3 100644 --- a/account_statement_ext/statement_view.xml +++ b/account_statement_ext/statement_view.xml @@ -5,7 +5,6 @@ account.statement.profile.view account.statement.profile - form @@ -27,7 +26,6 @@ account.statement.profile.view account.statement.profile - tree @@ -76,7 +74,6 @@ account.bank.statement.tree account.bank.statement - tree @@ -95,7 +92,6 @@ account.bank.statement.form account.bank.statement - form diff --git a/account_statement_no_invoice_import/statement_view.xml b/account_statement_no_invoice_import/statement_view.xml index 67920f41..488736a5 100644 --- a/account_statement_no_invoice_import/statement_view.xml +++ b/account_statement_no_invoice_import/statement_view.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,6 @@ account.bank.statement - form diff --git a/account_statement_ofx_import/statement.py b/account_statement_ofx_import/statement.py index bf8f64a0..a3800a84 100644 --- a/account_statement_ofx_import/statement.py +++ b/account_statement_ofx_import/statement.py @@ -19,16 +19,14 @@ # ############################################################################## from openerp.tools.translate import _ -from openerp.osv import fields, orm +from openerp.osv import orm class AccountStatementProfil(orm.Model): _inherit = "account.statement.profile" def _get_import_type_selection(self, cr, uid, context=None): - """ - Inherited from parent to add parser. - """ + """Inherited from parent to add parser.""" selection = super(AccountStatementProfil, self )._get_import_type_selection(cr, uid, context=context) diff --git a/account_statement_regex_account_completion/statement_view.xml b/account_statement_regex_account_completion/statement_view.xml index 2dd4e204..9af548cf 100644 --- a/account_statement_regex_account_completion/statement_view.xml +++ b/account_statement_regex_account_completion/statement_view.xml @@ -6,7 +6,6 @@ account.statement.completion.rule.view (account_statement_regex_account_completion) account.statement.completion.rule - form diff --git a/account_statement_so_completion/statement.py b/account_statement_so_completion/statement.py index 35be1e4d..8ca744f2 100644 --- a/account_statement_so_completion/statement.py +++ b/account_statement_so_completion/statement.py @@ -22,7 +22,7 @@ # # ############################################################################### -from openerp.osv import fields, orm +from openerp.osv import orm from tools.translate import _ from openerp.addons.account_statement_base_completion.statement import \ ErrorTooManyPartner diff --git a/account_statement_transactionid_import/statement.py b/account_statement_transactionid_import/statement.py index f923c1b0..6a52864b 100644 --- a/account_statement_transactionid_import/statement.py +++ b/account_statement_transactionid_import/statement.py @@ -19,17 +19,14 @@ # ############################################################################## -from openerp.osv.orm import Model -from openerp.osv import fields +from openerp.osv import orm -class AccountStatementProfil(Model): +class AccountStatementProfil(orm.Model): _inherit = "account.statement.profile" def _get_import_type_selection(self, cr, uid, context=None): - """ - Has to be inherited to add parser - """ + """Has to be inherited to add parser""" res = super(AccountStatementProfil, self)._get_import_type_selection( cr, uid, context=context) res.append(('generic_csvxls_transaction', diff --git a/base_transaction_id/invoice_view.xml b/base_transaction_id/invoice_view.xml index 2953720a..980dec89 100644 --- a/base_transaction_id/invoice_view.xml +++ b/base_transaction_id/invoice_view.xml @@ -5,7 +5,6 @@ customer.invoice.transaction.inherit account.invoice - form @@ -19,7 +18,6 @@ account.invoice.tree.inherit account.invoice - form diff --git a/base_transaction_id/sale_view.xml b/base_transaction_id/sale_view.xml index 512cac8c..70f78cbe 100644 --- a/base_transaction_id/sale_view.xml +++ b/base_transaction_id/sale_view.xml @@ -3,7 +3,6 @@ sale.order.form.transaction sale.order - form @@ -12,10 +11,10 @@ \ No newline at end of file diff --git a/invoicing_voucher_killer/invoice_view.xml b/invoicing_voucher_killer/invoice_view.xml index 9d792cc1..3ca3663e 100644 --- a/invoicing_voucher_killer/invoice_view.xml +++ b/invoicing_voucher_killer/invoice_view.xml @@ -4,7 +4,6 @@ Hide voucher in invoice account.invoice - form @@ -30,7 +29,6 @@ Hide voucher in supplier invoice account.invoice - form diff --git a/statement_voucher_killer/statement_view.xml b/statement_voucher_killer/statement_view.xml index e0ceda0a..32a23d76 100644 --- a/statement_voucher_killer/statement_view.xml +++ b/statement_voucher_killer/statement_view.xml @@ -2,14 +2,13 @@ - + account.bank.statement - form