From f8f123a92ac63ec46beb9ac1a4a51f1e4495c406 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 23 Dec 2011 12:56:02 +0100 Subject: [PATCH] [IMP] account_bank_statement_extensions: added the vim line on each new .py file bzr revid: qdp-launchpad@openerp.com-20111223115602-65yxx421cyyylmwb --- .../__init__.py | 2 ++ .../__openerp__.py | 3 +- .../account_bank_statement.py | 36 ++++++++++--------- .../report/__init__.py | 6 ++-- .../report/bank_statement_balance_report.py | 13 +++---- .../res_company.py | 5 +-- .../res_partner_bank.py | 5 +-- .../wizard/__init__.py | 6 ++-- .../wizard/cancel_statement_line.py | 10 +++--- .../wizard/confirm_statement_line.py | 10 +++--- 10 files changed, 55 insertions(+), 41 deletions(-) diff --git a/addons/account_bank_statement_extensions/__init__.py b/addons/account_bank_statement_extensions/__init__.py index f7e72e49c0b..1e4688b9e92 100644 --- a/addons/account_bank_statement_extensions/__init__.py +++ b/addons/account_bank_statement_extensions/__init__.py @@ -25,3 +25,5 @@ import res_company import res_partner_bank import report import wizard + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py index 7715a5598be..510aaef92bf 100644 --- a/addons/account_bank_statement_extensions/__openerp__.py +++ b/addons/account_bank_statement_extensions/__openerp__.py @@ -27,7 +27,7 @@ 'category': 'Generic Modules/Accounting', 'description': ''' Module that extends the standard account_bank_statement_line object for improved e-banking support. - + Adds - valuta date - batch payments @@ -55,3 +55,4 @@ Adds 'installable': True, } +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py index 063714f48e4..7e506c42173 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement.py +++ b/addons/account_bank_statement_extensions/account_bank_statement.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -34,7 +34,7 @@ class account_bank_statement(osv.osv): context = {} # bypass obsolete statement line resequencing if vals.get('line_ids', False) or context.get('ebanking_import', False): - res = super(osv.osv, self).write(cr, uid, ids, vals, context=context) + res = super(osv.osv, self).write(cr, uid, ids, vals, context=context) else: res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context) return res @@ -44,9 +44,9 @@ class account_bank_statement(osv.osv): for st in self.browse(cr, uid, ids, context=context): cr.execute("UPDATE account_bank_statement_line \ SET state='confirm' WHERE id in %s ", - (tuple([x.id for x in st.line_ids]),)) + (tuple([x.id for x in st.line_ids]),)) return True - + def button_cancel(self, cr, uid, ids, context=None): super(account_bank_statement, self).button_cancel(cr, uid, ids, context=context) for st in self.browse(cr, uid, ids, context=context): @@ -54,7 +54,7 @@ class account_bank_statement(osv.osv): SET state='draft' WHERE id in %s ", (tuple([x.id for x in st.line_ids]),)) return True - + account_bank_statement() class account_bank_statement_line_global(osv.osv): @@ -67,8 +67,8 @@ class account_bank_statement_line_global(osv.osv): 'parent_id': fields.many2one('account.bank.statement.line.global', 'Parent Code', ondelete='cascade'), 'child_ids': fields.one2many('account.bank.statement.line.global', 'parent_id', 'Child Codes'), 'type': fields.selection([ - ('iso20022', 'ISO 20022'), - ('coda', 'CODA'), + ('iso20022', 'ISO 20022'), + ('coda', 'CODA'), ('manual', 'Manual'), ], 'Type', required=True), 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), @@ -82,7 +82,7 @@ class account_bank_statement_line_global(osv.osv): _sql_constraints = [ ('code_uniq', 'unique (code)', 'The code must be unique !'), ] - + def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): if not args: args = [] @@ -98,35 +98,35 @@ class account_bank_statement_line_global(osv.osv): else: ids = self.search(cr, user, args, context=context, limit=limit) return self.name_get(cr, user, ids, context=context) - + account_bank_statement_line_global() class account_bank_statement_line(osv.osv): _inherit = 'account.bank.statement.line' _columns = { 'date': fields.date('Entry Date', required=True, states={'confirm': [('readonly', True)]}), - 'val_date': fields.date('Valuta Date', states={'confirm': [('readonly', True)]}), + 'val_date': fields.date('Valuta Date', states={'confirm': [('readonly', True)]}), 'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID', states={'confirm': [('readonly', True)]}, help="Code to identify transactions belonging to the same globalisation level within a batch payment"), - 'globalisation_amount': fields.related('globalisation_id', 'amount', type='float', + 'globalisation_amount': fields.related('globalisation_id', 'amount', type='float', relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True), 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True), 'update_date': fields.date('Update Date', required=True, readonly=True), - 'update_by': fields.many2one('res.users', 'Updated by', required=True, readonly=True), + 'update_by': fields.many2one('res.users', 'Updated by', required=True, readonly=True), 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')], 'State', required=True, readonly=True), 'counterparty_name': fields.char('Counterparty Name', size=35), - 'counterparty_bic': fields.char('Counterparty BIC', size=11), - 'counterparty_number': fields.char('Counterparty Number', size=34), - 'counterparty_currency': fields.char('Counterparty Currency', size=3), + 'counterparty_bic': fields.char('Counterparty BIC', size=11), + 'counterparty_number': fields.char('Counterparty Number', size=34), + 'counterparty_currency': fields.char('Counterparty Currency', size=3), } _defaults = { 'update_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'update_by': lambda s, c, u, ctx: u, 'state': 'draft', } - + def unlink(self, cr, uid, ids, context=None): if context is None: context = {} @@ -141,3 +141,5 @@ class account_bank_statement_line(osv.osv): return super(account_bank_statement_line, self).write(cr, uid, ids, vals, context=context) account_bank_statement_line() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_bank_statement_extensions/report/__init__.py b/addons/account_bank_statement_extensions/report/__init__.py index 26ac2bc2df0..a42f697dfaa 100644 --- a/addons/account_bank_statement_extensions/report/__init__.py +++ b/addons/account_bank_statement_extensions/report/__init__.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -21,3 +21,5 @@ ############################################################################## import bank_statement_balance_report + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py index 01f9b76c681..8e1e4b09e47 100644 --- a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py +++ b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -29,11 +29,11 @@ logger=netsvc.Logger() class bank_statement_balance_report(report_sxw.rml_parse): def set_context(self, objects, data, ids, report_type=None): - #logger.notifyChannel('addons.'+__name__, netsvc.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids)) + #logger.notifyChannel('addons.'+__name__, netsvc.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids)) cr = self.cr uid = self.uid context = self.context - + cr.execute('SELECT s.name as s_name, s.date AS s_date, j.code as j_code, s.balance_end_real as s_balance ' \ 'FROM account_bank_statement s ' \ 'INNER JOIN account_journal j on s.journal_id = j.id ' \ @@ -43,7 +43,7 @@ class bank_statement_balance_report(report_sxw.rml_parse): 'ON (s.journal_id = d.journal_id AND s.date = d.max_date) ' \ 'ORDER BY j.code') lines = cr.dictfetchall() - + self.localcontext.update( { 'lines': lines, }) @@ -58,7 +58,7 @@ class bank_statement_balance_report(report_sxw.rml_parse): 'time': time, }) self.context = context - + report_sxw.report_sxw( 'report.bank.statement.balance.report', 'account.bank.statement', @@ -67,3 +67,4 @@ report_sxw.report_sxw( header='internal' ) +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/res_company.py b/addons/account_bank_statement_extensions/res_company.py index 78c88c90726..e374c7286dc 100644 --- a/addons/account_bank_statement_extensions/res_company.py +++ b/addons/account_bank_statement_extensions/res_company.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -34,3 +34,4 @@ class res_company(osv.osv): res_company() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/res_partner_bank.py b/addons/account_bank_statement_extensions/res_partner_bank.py index b6deb07022e..b6b5af38b45 100644 --- a/addons/account_bank_statement_extensions/res_partner_bank.py +++ b/addons/account_bank_statement_extensions/res_partner_bank.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -39,3 +39,4 @@ class res_partner_bank(osv.osv): return self.name_get(cr, user, ids, context=context) res_partner_bank() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/wizard/__init__.py b/addons/account_bank_statement_extensions/wizard/__init__.py index c32f3d3bda9..697f5d2cc4f 100644 --- a/addons/account_bank_statement_extensions/wizard/__init__.py +++ b/addons/account_bank_statement_extensions/wizard/__init__.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -22,3 +22,5 @@ import confirm_statement_line import cancel_statement_line + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py index 05add83bcfa..50013beadbc 100644 --- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py +++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -28,11 +28,13 @@ from tools.translate import _ class cancel_statement_line(osv.osv_memory): _name = 'cancel.statement.line' _description = 'Cancel selected statement lines' - - def cancel_lines(self, cr, uid, ids, context): + + def cancel_lines(self, cr, uid, ids, context): line_ids = context['active_ids'] line_obj = self.pool.get('account.bank.statement.line') line_obj.write(cr, uid, line_ids, {'state': 'draft'}, context=context) return {} cancel_statement_line() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py index 9b66100d4c4..c5bf149c1cf 100644 --- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py +++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py @@ -2,9 +2,9 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# +# # Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved. -# +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as # published by the Free Software Foundation, either version 3 of the @@ -28,8 +28,8 @@ from tools.translate import _ class confirm_statement_line(osv.osv_memory): _name = 'confirm.statement.line' _description = 'Confirm selected statement lines' - - def confirm_lines(self, cr, uid, ids, context): + + def confirm_lines(self, cr, uid, ids, context): line_ids = context['active_ids'] line_obj = self.pool.get('account.bank.statement.line') line_obj.write(cr, uid, line_ids, {'state': 'confirm'}, context=context) @@ -37,4 +37,4 @@ class confirm_statement_line(osv.osv_memory): confirm_statement_line() - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: