From 98fb49aea241a328541066c004538d0c852f6488 Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Thu, 26 Feb 2015 16:08:09 +0100 Subject: [PATCH 01/14] [WIP] start fix for period on move. --- bank_transaction_period_fix/README.rst | 4 ++ bank_transaction_period_fix/__init__.py | 30 ++++++++++++++ bank_transaction_period_fix/__openerp__.py | 37 +++++++++++++++++ bank_transaction_period_fix/model/__init__.py | 31 ++++++++++++++ .../model/account_bank_statement_line.py | 37 +++++++++++++++++ .../model/account_move_line.py | 41 +++++++++++++++++++ 6 files changed, 180 insertions(+) create mode 100644 bank_transaction_period_fix/README.rst create mode 100644 bank_transaction_period_fix/__init__.py create mode 100644 bank_transaction_period_fix/__openerp__.py create mode 100644 bank_transaction_period_fix/model/__init__.py create mode 100644 bank_transaction_period_fix/model/account_bank_statement_line.py create mode 100644 bank_transaction_period_fix/model/account_move_line.py diff --git a/bank_transaction_period_fix/README.rst b/bank_transaction_period_fix/README.rst new file mode 100644 index 00000000..5db2e0c4 --- /dev/null +++ b/bank_transaction_period_fix/README.rst @@ -0,0 +1,4 @@ +Make sure that when reconciliation moves are generated for a bank +transaction, that the period for the moves is determined from the transaction +(bank statement line), and not from the bank statement period. + diff --git a/bank_transaction_period_fix/__init__.py b/bank_transaction_period_fix/__init__.py new file mode 100644 index 00000000..7c47ee42 --- /dev/null +++ b/bank_transaction_period_fix/__init__.py @@ -0,0 +1,30 @@ +# -*- encoding: utf-8 -*- +"""Import python modules.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# All Rights Reserved +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract EduSense BV +# +# 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 License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from . import model + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bank_transaction_period_fix/__openerp__.py b/bank_transaction_period_fix/__openerp__.py new file mode 100644 index 00000000..f122eb48 --- /dev/null +++ b/bank_transaction_period_fix/__openerp__.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# 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 +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + 'name': 'Account banking fix to use transaction date to determine period', + 'version': '1.0', + 'author': 'Therp BV', + 'category': 'Banking addons', + 'complexity': 'easy', + 'depends': [ + 'account', + ], + 'website': 'https://github.com/OCA/bank-statement-import', + 'data': [], + 'test': [], + 'installable': True, + 'images': [], + 'auto_install': False, + 'license': 'AGPL-3', +} diff --git a/bank_transaction_period_fix/model/__init__.py b/bank_transaction_period_fix/model/__init__.py new file mode 100644 index 00000000..708e6440 --- /dev/null +++ b/bank_transaction_period_fix/model/__init__.py @@ -0,0 +1,31 @@ +# -*- encoding: utf-8 -*- +"""Import python modules extending orm models.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# All Rights Reserved +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract EduSense BV +# +# 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 License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from . import account_bank_statement_line +from . import account_move_line + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bank_transaction_period_fix/model/account_bank_statement_line.py b/bank_transaction_period_fix/model/account_bank_statement_line.py new file mode 100644 index 00000000..d96f6d67 --- /dev/null +++ b/bank_transaction_period_fix/model/account_bank_statement_line.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +"""Extend account.bank.statement.line to use transaction date in moves.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# 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 +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from openerp.osv import orm + + +class AccountBankStatementLine(orm.Model): + """Extend account.bank.statement.line to use transaction date in moves.""" + _inherit = 'account.bank.statement.line' + + def process_reconciliation( + self, cr, uid, id, mv_line_dicts, context=None): + """Put marker in context to use period from date in move line.""" + ctx = context.copy() or {} + ctx['override_period_from_date'] = True + return super(AccountBankStatementLine, self).process_reconciliation( + cr, uid, id, mv_line_dicts, context=ctx) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bank_transaction_period_fix/model/account_move_line.py b/bank_transaction_period_fix/model/account_move_line.py new file mode 100644 index 00000000..e6d615d4 --- /dev/null +++ b/bank_transaction_period_fix/model/account_move_line.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +"""Extend account.move.line to use date for period, when requested.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# 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 +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from openerp.osv import orm + + +class AccountMoveLine(orm.Model): + """Extend account.move.line to use date for period, when requested.""" + _inherit = 'account.move.line' + + def create(self, cr, uid, vals, context=None, check=True): + """If requested, override period from date.""" + ctx = context.copy() or {} + if (('override_period_from_date' in ctx or + 'period_id' not in vals) and 'date' in vals): + period_model = self.pool['account.period'] + period_ids = period_search + ## BE CAREFULL, ALSO CHECK COMPANY + vals['period_id'] = period_ids[0] + return super(AccountMoveLine, self).create( + cr, uid, vals, context=context, check=check) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 6ef58a47e7ca2809f95b95b68bf03007a3fa4f82 Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Thu, 26 Feb 2015 16:34:23 +0100 Subject: [PATCH 02/14] [WIP] add proper search for period. --- .../model/account_move_line.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/bank_transaction_period_fix/model/account_move_line.py b/bank_transaction_period_fix/model/account_move_line.py index e6d615d4..3245d9b1 100644 --- a/bank_transaction_period_fix/model/account_move_line.py +++ b/bank_transaction_period_fix/model/account_move_line.py @@ -28,13 +28,15 @@ class AccountMoveLine(orm.Model): def create(self, cr, uid, vals, context=None, check=True): """If requested, override period from date.""" - ctx = context.copy() or {} - if (('override_period_from_date' in ctx or - 'period_id' not in vals) and 'date' in vals): - period_model = self.pool['account.period'] - period_ids = period_search - ## BE CAREFULL, ALSO CHECK COMPANY - vals['period_id'] = period_ids[0] + ctx = context.copy() or {} + if (('override_period_from_date' in ctx or + 'period_id' not in vals) and 'date' in vals): + period_model = self.pool['account.period'] + search_date = 'date' in vals and vals['date'] or None + period_ids = period_model.find( + cr, uid, dt=search_date, context=ctx) + if period_ids: + vals['period_id'] = period_ids[0] return super(AccountMoveLine, self).create( cr, uid, vals, context=context, check=check) From 158ecaa401904c5f05f94ffa84c7c102a83179cd Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Thu, 26 Feb 2015 16:39:12 +0100 Subject: [PATCH 03/14] [WIP] Correct indentation. --- .../model/account_bank_statement_line.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bank_transaction_period_fix/model/account_bank_statement_line.py b/bank_transaction_period_fix/model/account_bank_statement_line.py index d96f6d67..efaa300d 100644 --- a/bank_transaction_period_fix/model/account_bank_statement_line.py +++ b/bank_transaction_period_fix/model/account_bank_statement_line.py @@ -26,12 +26,12 @@ class AccountBankStatementLine(orm.Model): """Extend account.bank.statement.line to use transaction date in moves.""" _inherit = 'account.bank.statement.line' - def process_reconciliation( + def process_reconciliation( self, cr, uid, id, mv_line_dicts, context=None): - """Put marker in context to use period from date in move line.""" - ctx = context.copy() or {} - ctx['override_period_from_date'] = True - return super(AccountBankStatementLine, self).process_reconciliation( - cr, uid, id, mv_line_dicts, context=ctx) + """Put marker in context to use period from date in move line.""" + ctx = context.copy() or {} + ctx['override_period_from_date'] = True + return super(AccountBankStatementLine, self).process_reconciliation( + cr, uid, id, mv_line_dicts, context=ctx) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 42bbc31d2be006915c9863af6dbe4a38364a0a9f Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Thu, 26 Feb 2015 16:49:48 +0100 Subject: [PATCH 04/14] [WIP] Correct check for context. --- .../model/account_bank_statement_line.py | 2 +- bank_transaction_period_fix/model/account_move_line.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bank_transaction_period_fix/model/account_bank_statement_line.py b/bank_transaction_period_fix/model/account_bank_statement_line.py index efaa300d..7d1aff20 100644 --- a/bank_transaction_period_fix/model/account_bank_statement_line.py +++ b/bank_transaction_period_fix/model/account_bank_statement_line.py @@ -29,7 +29,7 @@ class AccountBankStatementLine(orm.Model): def process_reconciliation( self, cr, uid, id, mv_line_dicts, context=None): """Put marker in context to use period from date in move line.""" - ctx = context.copy() or {} + ctx = context and context.copy() or {} ctx['override_period_from_date'] = True return super(AccountBankStatementLine, self).process_reconciliation( cr, uid, id, mv_line_dicts, context=ctx) diff --git a/bank_transaction_period_fix/model/account_move_line.py b/bank_transaction_period_fix/model/account_move_line.py index 3245d9b1..70a38971 100644 --- a/bank_transaction_period_fix/model/account_move_line.py +++ b/bank_transaction_period_fix/model/account_move_line.py @@ -28,7 +28,7 @@ class AccountMoveLine(orm.Model): def create(self, cr, uid, vals, context=None, check=True): """If requested, override period from date.""" - ctx = context.copy() or {} + ctx = context and context.copy() or {} if (('override_period_from_date' in ctx or 'period_id' not in vals) and 'date' in vals): period_model = self.pool['account.period'] From ca68ca1976f322c0faaa28a611093cb7680dc6ab Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Thu, 26 Feb 2015 18:13:22 +0100 Subject: [PATCH 05/14] [WIP] Also override bank.statement _prepare_move --- bank_transaction_period_fix/model/__init__.py | 1 + .../model/account_bank_statement.py | 45 +++++++++++++++++++ .../model/account_move_line.py | 6 +-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 bank_transaction_period_fix/model/account_bank_statement.py diff --git a/bank_transaction_period_fix/model/__init__.py b/bank_transaction_period_fix/model/__init__.py index 708e6440..bfabed5b 100644 --- a/bank_transaction_period_fix/model/__init__.py +++ b/bank_transaction_period_fix/model/__init__.py @@ -25,6 +25,7 @@ # along with this program. If not, see . # ############################################################################## +from . import account_bank_statement from . import account_bank_statement_line from . import account_move_line diff --git a/bank_transaction_period_fix/model/account_bank_statement.py b/bank_transaction_period_fix/model/account_bank_statement.py new file mode 100644 index 00000000..23dc675c --- /dev/null +++ b/bank_transaction_period_fix/model/account_bank_statement.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +"""Extend account.bank.statement to use transaction date in moves.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# 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 +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from openerp.osv import orm + + +class AccountBankStatement(orm.Model): + """Extend account.bank.statement to use transaction date in moves.""" + _inherit = 'account.bank.statement' + + def _prepare_move( + self, cr, uid, st_line, st_line_number, context=None): + """Put marker in context to use period from date in move line.""" + res = super(AccountBankStatement, self)._prepare_move( + cr, uid, st_line, st_line_number, context=context) + context = context or {} + if (('override_period_from_date' in context or + 'period_id' not in res) and 'date' in res): + period_model = self.pool['account.period'] + search_date = 'date' in res and res['date'] or None + period_ids = period_model.find( + cr, uid, dt=search_date, context=context) + if period_ids: + res['period_id'] = period_ids[0] + return res + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bank_transaction_period_fix/model/account_move_line.py b/bank_transaction_period_fix/model/account_move_line.py index 70a38971..81ed5bda 100644 --- a/bank_transaction_period_fix/model/account_move_line.py +++ b/bank_transaction_period_fix/model/account_move_line.py @@ -28,13 +28,13 @@ class AccountMoveLine(orm.Model): def create(self, cr, uid, vals, context=None, check=True): """If requested, override period from date.""" - ctx = context and context.copy() or {} - if (('override_period_from_date' in ctx or + context = context or {} + if (('override_period_from_date' in context or 'period_id' not in vals) and 'date' in vals): period_model = self.pool['account.period'] search_date = 'date' in vals and vals['date'] or None period_ids = period_model.find( - cr, uid, dt=search_date, context=ctx) + cr, uid, dt=search_date, context=context) if period_ids: vals['period_id'] = period_ids[0] return super(AccountMoveLine, self).create( From eb85bafc4432fd3ed62f602118547f8582daf08b Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Thu, 9 Apr 2015 18:47:35 +0200 Subject: [PATCH 06/14] [ENH] Add module to take move period from bank transaction line. --- .../README.rst | 0 .../__init__.py | 2 - .../__openerp__.py | 4 +- .../model/__init__.py | 2 - .../model/account_bank_statement.py | 0 .../model/account_bank_statement_line.py | 0 .../model/account_move_line.py | 0 .../tests/__init__.py | 27 ++++ .../tests/test_reconciliation.py | 130 ++++++++++++++++++ 9 files changed, 159 insertions(+), 6 deletions(-) rename {bank_transaction_period_fix => move_period_from_transaction_date}/README.rst (100%) rename {bank_transaction_period_fix => move_period_from_transaction_date}/__init__.py (89%) rename {bank_transaction_period_fix => move_period_from_transaction_date}/__openerp__.py (89%) rename {bank_transaction_period_fix => move_period_from_transaction_date}/model/__init__.py (90%) rename {bank_transaction_period_fix => move_period_from_transaction_date}/model/account_bank_statement.py (100%) rename {bank_transaction_period_fix => move_period_from_transaction_date}/model/account_bank_statement_line.py (100%) rename {bank_transaction_period_fix => move_period_from_transaction_date}/model/account_move_line.py (100%) create mode 100644 move_period_from_transaction_date/tests/__init__.py create mode 100644 move_period_from_transaction_date/tests/test_reconciliation.py diff --git a/bank_transaction_period_fix/README.rst b/move_period_from_transaction_date/README.rst similarity index 100% rename from bank_transaction_period_fix/README.rst rename to move_period_from_transaction_date/README.rst diff --git a/bank_transaction_period_fix/__init__.py b/move_period_from_transaction_date/__init__.py similarity index 89% rename from bank_transaction_period_fix/__init__.py rename to move_period_from_transaction_date/__init__.py index 7c47ee42..e72df53e 100644 --- a/bank_transaction_period_fix/__init__.py +++ b/move_period_from_transaction_date/__init__.py @@ -8,8 +8,6 @@ # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential # consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract EduSense BV # # 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 diff --git a/bank_transaction_period_fix/__openerp__.py b/move_period_from_transaction_date/__openerp__.py similarity index 89% rename from bank_transaction_period_fix/__openerp__.py rename to move_period_from_transaction_date/__openerp__.py index f122eb48..7cc83500 100644 --- a/bank_transaction_period_fix/__openerp__.py +++ b/move_period_from_transaction_date/__openerp__.py @@ -19,7 +19,7 @@ # ############################################################################## { - 'name': 'Account banking fix to use transaction date to determine period', + 'name': 'Use bank transaction (line) date to determine move period', 'version': '1.0', 'author': 'Therp BV', 'category': 'Banking addons', @@ -27,7 +27,7 @@ 'depends': [ 'account', ], - 'website': 'https://github.com/OCA/bank-statement-import', + 'website': 'https://github.com/OCA/bank-statement-reconcile', 'data': [], 'test': [], 'installable': True, diff --git a/bank_transaction_period_fix/model/__init__.py b/move_period_from_transaction_date/model/__init__.py similarity index 90% rename from bank_transaction_period_fix/model/__init__.py rename to move_period_from_transaction_date/model/__init__.py index bfabed5b..a3fb3c75 100644 --- a/bank_transaction_period_fix/model/__init__.py +++ b/move_period_from_transaction_date/model/__init__.py @@ -8,8 +8,6 @@ # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential # consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract EduSense BV # # 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 diff --git a/bank_transaction_period_fix/model/account_bank_statement.py b/move_period_from_transaction_date/model/account_bank_statement.py similarity index 100% rename from bank_transaction_period_fix/model/account_bank_statement.py rename to move_period_from_transaction_date/model/account_bank_statement.py diff --git a/bank_transaction_period_fix/model/account_bank_statement_line.py b/move_period_from_transaction_date/model/account_bank_statement_line.py similarity index 100% rename from bank_transaction_period_fix/model/account_bank_statement_line.py rename to move_period_from_transaction_date/model/account_bank_statement_line.py diff --git a/bank_transaction_period_fix/model/account_move_line.py b/move_period_from_transaction_date/model/account_move_line.py similarity index 100% rename from bank_transaction_period_fix/model/account_move_line.py rename to move_period_from_transaction_date/model/account_move_line.py diff --git a/move_period_from_transaction_date/tests/__init__.py b/move_period_from_transaction_date/tests/__init__.py new file mode 100644 index 00000000..7c5e01ac --- /dev/null +++ b/move_period_from_transaction_date/tests/__init__.py @@ -0,0 +1,27 @@ +"""Import unit tests.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# All Rights Reserved +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# +# 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 License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from . import test_reconciliation + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/move_period_from_transaction_date/tests/test_reconciliation.py b/move_period_from_transaction_date/tests/test_reconciliation.py new file mode 100644 index 00000000..8ae6724c --- /dev/null +++ b/move_period_from_transaction_date/tests/test_reconciliation.py @@ -0,0 +1,130 @@ +"""Unit test to check wether period taken from transaction date.""" +############################################################################## +# +# Copyright (C) 2015 Therp BV - http://therp.nl. +# All Rights Reserved +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# +# 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 License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +from openerp.tests.common import TransactionCase +import time + +class TestReconciliation(TransactionCase): + """Tests to make sure that transactions take period from statement line.""" + + def test_period_from_transaction(self): + """Move line for reconciliation should take period from transaction. + + Setup a bank statement and a bank statement line (transaction) with + dates from different period. Created moves produced by reconciliation + should take the period from the line date, not from the statement date. + """ + cr, uid = self.cr, self.uid + # Setup dates for testing: + current_year = time.strftime('%Y') + invoice_date = '%s-07-01' % current_year # july + statement_date = '%s-09-01' % current_year # september + transaction_date = '%s-08-01' % current_year # august + # Get references to demo data + data_model = self.registry('ir.model.data') + partner_agrolait_id = data_model.get_object_reference( + cr, uid, 'base', 'res_partner_2')[1] + account_rcv_id = data_model.get_object_reference( + cr, uid, 'account', 'a_recv')[1] + currency_usd_id = data_model.get_object_reference( + cr, uid, 'base', 'USD')[1] + bank_journal_usd_id = data_model.get_object_reference( + cr, uid, 'account', 'bank_journal_usd')[1] + account_usd_id = data_model.get_object_reference( + cr, uid, 'account', 'usd_bnk')[1] + # Get other models from registry: + period_model = self.registry('account.period') + account_invoice_model = self.registry('account.invoice') + account_invoice_line_model = self.registry('account.invoice.line') + statement_model = self.registry('account.bank.statement') + statement_line_model = self.registry('account.bank.statement.line') + # Create invoice in dollars: + invoice_id = account_invoice_model.create( + cr, uid, { + 'partner_id': partner_agrolait_id, + 'currency_id': currency_usd_id, + 'reference_type': 'none', + 'name': 'invoice to client', + 'account_id': account_rcv_id, + 'type': 'out_invoice', + 'date_invoice': invoice_date, + } + ) + account_invoice_line_model.create( + cr, uid, { + 'name': 'product that cost 100.00', + 'quantity': 1.0, + 'price_unit': 100.0, + 'invoice_id': invoice_id, + } + ) + # Validate sale: + account_invoice_model.signal_workflow( + cr, uid, [invoice_id], 'invoice_open') + invoice_record = account_invoice_model.browse(cr, uid, [invoice_id]) + # Bank statement from september: + bank_stmt_id = statement_model.create( + cr, uid, { + 'journal_id': bank_journal_usd_id, + 'date': statement_date, + } + ) + # Transaction from august: + bank_stmt_line_id = statement_line_model.create( + cr, uid, { + 'name': 'complete payment', + 'statement_id': bank_stmt_id, + 'partner_id': partner_agrolait_id, + 'amount': 100.00, + 'date': transaction_date, + } + ) + # Reconcile the payment with the invoice: + for l in invoice_record.move_id.line_id: + if l.account_id.id == account_rcv_id: + line_id = l + break + statement_line_model.process_reconciliation( + cr, uid, bank_stmt_line_id, [{ + 'counterpart_move_line_id': line_id.id, + 'credit': 100.0, + 'debit': 0.0, + 'name': line_id.name, + }] + ) + # Get period for transaction date: + test_period_id = period_model.find(cr, uid, dt=transaction_date)[0] + # Get move lines for bank statement: + move_line_ids = statement_model.browse( + cr, uid, bank_stmt_id).move_line_ids + # Period in move line for bank transaction, and for move should equal + # period from transaction: + for move_line in move_line_ids: + if move_line.account_id.id == account_usd_id: + self.assertEquals( + move_line.period_id.id, test_period_id) + self.assertEquals( + move_line.move_id.period_id.id, test_period_id) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From b746ffffd4d7a4e175b31de5a6e2153203fbb724 Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Mon, 13 Apr 2015 00:03:10 +0200 Subject: [PATCH 07/14] [PEP] Should pass Travis checks now. --- .../model/account_bank_statement.py | 2 +- move_period_from_transaction_date/model/account_move_line.py | 2 +- move_period_from_transaction_date/tests/test_reconciliation.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/move_period_from_transaction_date/model/account_bank_statement.py b/move_period_from_transaction_date/model/account_bank_statement.py index 23dc675c..03f4420b 100644 --- a/move_period_from_transaction_date/model/account_bank_statement.py +++ b/move_period_from_transaction_date/model/account_bank_statement.py @@ -33,7 +33,7 @@ class AccountBankStatement(orm.Model): cr, uid, st_line, st_line_number, context=context) context = context or {} if (('override_period_from_date' in context or - 'period_id' not in res) and 'date' in res): + 'period_id' not in res) and 'date' in res): period_model = self.pool['account.period'] search_date = 'date' in res and res['date'] or None period_ids = period_model.find( diff --git a/move_period_from_transaction_date/model/account_move_line.py b/move_period_from_transaction_date/model/account_move_line.py index 81ed5bda..2766e05f 100644 --- a/move_period_from_transaction_date/model/account_move_line.py +++ b/move_period_from_transaction_date/model/account_move_line.py @@ -30,7 +30,7 @@ class AccountMoveLine(orm.Model): """If requested, override period from date.""" context = context or {} if (('override_period_from_date' in context or - 'period_id' not in vals) and 'date' in vals): + 'period_id' not in vals) and 'date' in vals): period_model = self.pool['account.period'] search_date = 'date' in vals and vals['date'] or None period_ids = period_model.find( diff --git a/move_period_from_transaction_date/tests/test_reconciliation.py b/move_period_from_transaction_date/tests/test_reconciliation.py index 8ae6724c..bd2e0e9a 100644 --- a/move_period_from_transaction_date/tests/test_reconciliation.py +++ b/move_period_from_transaction_date/tests/test_reconciliation.py @@ -25,6 +25,7 @@ from openerp.tests.common import TransactionCase import time + class TestReconciliation(TransactionCase): """Tests to make sure that transactions take period from statement line.""" From 3bf7b3faa5b8c63e2f2081feb4c09dca7b002db6 Mon Sep 17 00:00:00 2001 From: "Ronald Portier (Therp BV)" Date: Mon, 13 Apr 2015 11:27:05 +0200 Subject: [PATCH 08/14] [FIX] Style improvements in move_period_from_transaction_date. --- move_period_from_transaction_date/README.rst | 35 +++++++++++++++++-- .../__openerp__.py | 3 +- .../model/account_bank_statement_line.py | 4 +-- .../model/account_move_line.py | 2 +- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/move_period_from_transaction_date/README.rst b/move_period_from_transaction_date/README.rst index 5db2e0c4..89348eca 100644 --- a/move_period_from_transaction_date/README.rst +++ b/move_period_from_transaction_date/README.rst @@ -1,4 +1,33 @@ -Make sure that when reconciliation moves are generated for a bank -transaction, that the period for the moves is determined from the transaction -(bank statement line), and not from the bank statement period. +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +Module name +=========== + +This module was written to make sure that when reconciliation moves are +generated for a bank transaction, that the period for the moves is determined +from the transaction (bank statement line), and not from the bank statement +period. + +Contributors +------------ + +* Stefan Rijnhart +* Ronald Portier + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. + diff --git a/move_period_from_transaction_date/__openerp__.py b/move_period_from_transaction_date/__openerp__.py index 7cc83500..ff48ae91 100644 --- a/move_period_from_transaction_date/__openerp__.py +++ b/move_period_from_transaction_date/__openerp__.py @@ -21,9 +21,8 @@ { 'name': 'Use bank transaction (line) date to determine move period', 'version': '1.0', - 'author': 'Therp BV', + 'author': 'Therp BV, Odoo Community Association (OCA)', 'category': 'Banking addons', - 'complexity': 'easy', 'depends': [ 'account', ], diff --git a/move_period_from_transaction_date/model/account_bank_statement_line.py b/move_period_from_transaction_date/model/account_bank_statement_line.py index 7d1aff20..849b2a40 100644 --- a/move_period_from_transaction_date/model/account_bank_statement_line.py +++ b/move_period_from_transaction_date/model/account_bank_statement_line.py @@ -27,11 +27,11 @@ class AccountBankStatementLine(orm.Model): _inherit = 'account.bank.statement.line' def process_reconciliation( - self, cr, uid, id, mv_line_dicts, context=None): + self, cr, uid, statement_line_id, mv_line_dicts, context=None): """Put marker in context to use period from date in move line.""" ctx = context and context.copy() or {} ctx['override_period_from_date'] = True return super(AccountBankStatementLine, self).process_reconciliation( - cr, uid, id, mv_line_dicts, context=ctx) + cr, uid, statement_line_id, mv_line_dicts, context=ctx) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/move_period_from_transaction_date/model/account_move_line.py b/move_period_from_transaction_date/model/account_move_line.py index 2766e05f..5e7cb32f 100644 --- a/move_period_from_transaction_date/model/account_move_line.py +++ b/move_period_from_transaction_date/model/account_move_line.py @@ -32,7 +32,7 @@ class AccountMoveLine(orm.Model): if (('override_period_from_date' in context or 'period_id' not in vals) and 'date' in vals): period_model = self.pool['account.period'] - search_date = 'date' in vals and vals['date'] or None + search_date = vals.get('date') period_ids = period_model.find( cr, uid, dt=search_date, context=context) if period_ids: From 1d87fd5c45531c5a33a80ca13622550f626394ce Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 3 Jul 2015 10:32:15 +0200 Subject: [PATCH 09/14] [RFR] Improve test --- .../tests/test_reconciliation.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/move_period_from_transaction_date/tests/test_reconciliation.py b/move_period_from_transaction_date/tests/test_reconciliation.py index bd2e0e9a..671a552b 100644 --- a/move_period_from_transaction_date/tests/test_reconciliation.py +++ b/move_period_from_transaction_date/tests/test_reconciliation.py @@ -52,8 +52,6 @@ class TestReconciliation(TransactionCase): cr, uid, 'base', 'USD')[1] bank_journal_usd_id = data_model.get_object_reference( cr, uid, 'account', 'bank_journal_usd')[1] - account_usd_id = data_model.get_object_reference( - cr, uid, 'account', 'usd_bnk')[1] # Get other models from registry: period_model = self.registry('account.period') account_invoice_model = self.registry('account.invoice') @@ -122,10 +120,9 @@ class TestReconciliation(TransactionCase): # Period in move line for bank transaction, and for move should equal # period from transaction: for move_line in move_line_ids: - if move_line.account_id.id == account_usd_id: - self.assertEquals( - move_line.period_id.id, test_period_id) - self.assertEquals( - move_line.move_id.period_id.id, test_period_id) + self.assertEquals( + move_line.period_id.id, test_period_id) + self.assertEquals( + move_line.move_id.period_id.id, test_period_id) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 4303347f5eb44e88005c3abbde5989210a84fb5d Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 3 Jul 2015 11:09:35 +0200 Subject: [PATCH 10/14] [FIX] Inject period if the move line is created without a date --- .../model/__init__.py | 1 + .../model/account_bank_statement.py | 13 +++-------- .../model/account_bank_statement_line.py | 23 ++++++++++--------- .../model/account_move_line.py | 11 ++------- 4 files changed, 18 insertions(+), 30 deletions(-) diff --git a/move_period_from_transaction_date/model/__init__.py b/move_period_from_transaction_date/model/__init__.py index a3fb3c75..68abc999 100644 --- a/move_period_from_transaction_date/model/__init__.py +++ b/move_period_from_transaction_date/model/__init__.py @@ -23,6 +23,7 @@ # along with this program. If not, see . # ############################################################################## +from . import account_bank_statement_line from . import account_bank_statement from . import account_bank_statement_line from . import account_move_line diff --git a/move_period_from_transaction_date/model/account_bank_statement.py b/move_period_from_transaction_date/model/account_bank_statement.py index 03f4420b..8ed4c6bc 100644 --- a/move_period_from_transaction_date/model/account_bank_statement.py +++ b/move_period_from_transaction_date/model/account_bank_statement.py @@ -28,18 +28,11 @@ class AccountBankStatement(orm.Model): def _prepare_move( self, cr, uid, st_line, st_line_number, context=None): - """Put marker in context to use period from date in move line.""" + """If requested, override period from date.""" res = super(AccountBankStatement, self)._prepare_move( cr, uid, st_line, st_line_number, context=context) - context = context or {} - if (('override_period_from_date' in context or - 'period_id' not in res) and 'date' in res): - period_model = self.pool['account.period'] - search_date = 'date' in res and res['date'] or None - period_ids = period_model.find( - cr, uid, dt=search_date, context=context) - if period_ids: - res['period_id'] = period_ids[0] + if (context or {}).get('force_period_id'): + res['period_id'] = context['force_period_id'] return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/move_period_from_transaction_date/model/account_bank_statement_line.py b/move_period_from_transaction_date/model/account_bank_statement_line.py index 849b2a40..4af54ce8 100644 --- a/move_period_from_transaction_date/model/account_bank_statement_line.py +++ b/move_period_from_transaction_date/model/account_bank_statement_line.py @@ -3,7 +3,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# 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 @@ -19,19 +18,21 @@ # along with this program. If not, see . # ############################################################################## -from openerp.osv import orm +from openerp import models, api -class AccountBankStatementLine(orm.Model): +class AccountBankStatementLine(models.Model): """Extend account.bank.statement.line to use transaction date in moves.""" _inherit = 'account.bank.statement.line' - def process_reconciliation( - self, cr, uid, statement_line_id, mv_line_dicts, context=None): - """Put marker in context to use period from date in move line.""" - ctx = context and context.copy() or {} - ctx['override_period_from_date'] = True + @api.one + def process_reconciliation(self, mv_line_dicts): + """ Retrieve the period derived from the statement line and store in + the context for further use """ + periods = self.env['account.period'].find(dt=self.date) + if periods: + return super(AccountBankStatementLine, + self.with_context(force_period_id=periods[0].id)).\ + process_reconciliation(mv_line_dicts) return super(AccountBankStatementLine, self).process_reconciliation( - cr, uid, statement_line_id, mv_line_dicts, context=ctx) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + mv_line_dicts) diff --git a/move_period_from_transaction_date/model/account_move_line.py b/move_period_from_transaction_date/model/account_move_line.py index 5e7cb32f..c647cd83 100644 --- a/move_period_from_transaction_date/model/account_move_line.py +++ b/move_period_from_transaction_date/model/account_move_line.py @@ -28,15 +28,8 @@ class AccountMoveLine(orm.Model): def create(self, cr, uid, vals, context=None, check=True): """If requested, override period from date.""" - context = context or {} - if (('override_period_from_date' in context or - 'period_id' not in vals) and 'date' in vals): - period_model = self.pool['account.period'] - search_date = vals.get('date') - period_ids = period_model.find( - cr, uid, dt=search_date, context=context) - if period_ids: - vals['period_id'] = period_ids[0] + if (context or {}).get('force_period_id'): + vals['period_id'] = context['force_period_id'] return super(AccountMoveLine, self).create( cr, uid, vals, context=context, check=check) From 0b1a0c10bf7c4874bb35cce1fdf86185134cfbfe Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 3 Jul 2015 11:10:05 +0200 Subject: [PATCH 11/14] [RFR] Port to API and conformity --- move_period_from_transaction_date/README.rst | 13 +- move_period_from_transaction_date/__init__.py | 7 - .../__openerp__.py | 1 - .../model/__init__.py | 1 - .../model/account_bank_statement.py | 17 +-- .../model/account_bank_statement_line.py | 2 +- .../model/account_move_line.py | 17 +-- .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/test_reconciliation.py | 128 +++++++----------- 9 files changed, 74 insertions(+), 112 deletions(-) create mode 100644 move_period_from_transaction_date/static/description/icon.png diff --git a/move_period_from_transaction_date/README.rst b/move_period_from_transaction_date/README.rst index 89348eca..17a64cd9 100644 --- a/move_period_from_transaction_date/README.rst +++ b/move_period_from_transaction_date/README.rst @@ -4,10 +4,17 @@ Module name =========== +By default, a bank statement in Odoo has its own period, and this period +will be assigned to all the moves generated from the bank statement lines, +regardless of their effective dates. + +The desirability of this behaviour depends on the jurisdiction and may be +illegal. + This module was written to make sure that when reconciliation moves are -generated for a bank transaction, that the period for the moves is determined -from the transaction (bank statement line), and not from the bank statement -period. +generated for a bank transaction, the period for the moves is determined from +the transaction (bank statement line) date, and not taken from the bank +statement. Contributors ------------ diff --git a/move_period_from_transaction_date/__init__.py b/move_period_from_transaction_date/__init__.py index e72df53e..d95af88e 100644 --- a/move_period_from_transaction_date/__init__.py +++ b/move_period_from_transaction_date/__init__.py @@ -3,11 +3,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# All Rights Reserved -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs # # 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 @@ -24,5 +19,3 @@ # ############################################################################## from . import model - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/move_period_from_transaction_date/__openerp__.py b/move_period_from_transaction_date/__openerp__.py index ff48ae91..87abdb06 100644 --- a/move_period_from_transaction_date/__openerp__.py +++ b/move_period_from_transaction_date/__openerp__.py @@ -2,7 +2,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# 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 diff --git a/move_period_from_transaction_date/model/__init__.py b/move_period_from_transaction_date/model/__init__.py index 68abc999..5f24b18c 100644 --- a/move_period_from_transaction_date/model/__init__.py +++ b/move_period_from_transaction_date/model/__init__.py @@ -25,7 +25,6 @@ ############################################################################## from . import account_bank_statement_line from . import account_bank_statement -from . import account_bank_statement_line from . import account_move_line # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/move_period_from_transaction_date/model/account_bank_statement.py b/move_period_from_transaction_date/model/account_bank_statement.py index 8ed4c6bc..23cacc33 100644 --- a/move_period_from_transaction_date/model/account_bank_statement.py +++ b/move_period_from_transaction_date/model/account_bank_statement.py @@ -3,7 +3,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# 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 @@ -19,20 +18,18 @@ # along with this program. If not, see . # ############################################################################## -from openerp.osv import orm +from openerp import models, api -class AccountBankStatement(orm.Model): +class AccountBankStatement(models.Model): """Extend account.bank.statement to use transaction date in moves.""" _inherit = 'account.bank.statement' - def _prepare_move( - self, cr, uid, st_line, st_line_number, context=None): + @api.model + def _prepare_move(self, st_line, st_line_number): """If requested, override period from date.""" res = super(AccountBankStatement, self)._prepare_move( - cr, uid, st_line, st_line_number, context=context) - if (context or {}).get('force_period_id'): - res['period_id'] = context['force_period_id'] + st_line, st_line_number) + if self.env.context.get('force_period_id'): + res['period_id'] = self.env.context['force_period_id'] return res - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/move_period_from_transaction_date/model/account_bank_statement_line.py b/move_period_from_transaction_date/model/account_bank_statement_line.py index 4af54ce8..429c2b43 100644 --- a/move_period_from_transaction_date/model/account_bank_statement_line.py +++ b/move_period_from_transaction_date/model/account_bank_statement_line.py @@ -33,6 +33,6 @@ class AccountBankStatementLine(models.Model): if periods: return super(AccountBankStatementLine, self.with_context(force_period_id=periods[0].id)).\ - process_reconciliation(mv_line_dicts) + process_reconciliation(mv_line_dicts) return super(AccountBankStatementLine, self).process_reconciliation( mv_line_dicts) diff --git a/move_period_from_transaction_date/model/account_move_line.py b/move_period_from_transaction_date/model/account_move_line.py index c647cd83..4fb0d089 100644 --- a/move_period_from_transaction_date/model/account_move_line.py +++ b/move_period_from_transaction_date/model/account_move_line.py @@ -3,7 +3,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# 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 @@ -19,18 +18,16 @@ # along with this program. If not, see . # ############################################################################## -from openerp.osv import orm +from openerp import models, api -class AccountMoveLine(orm.Model): +class AccountMoveLine(models.Model): """Extend account.move.line to use date for period, when requested.""" _inherit = 'account.move.line' - def create(self, cr, uid, vals, context=None, check=True): + @api.model + def create(self, vals, check=True): """If requested, override period from date.""" - if (context or {}).get('force_period_id'): - vals['period_id'] = context['force_period_id'] - return super(AccountMoveLine, self).create( - cr, uid, vals, context=context, check=check) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + if self.env.context.get('force_period_id'): + vals['period_id'] = self.env.context['force_period_id'] + return super(AccountMoveLine, self).create(vals, check=check) diff --git a/move_period_from_transaction_date/static/description/icon.png b/move_period_from_transaction_date/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/move_period_from_transaction_date/tests/test_reconciliation.py b/move_period_from_transaction_date/tests/test_reconciliation.py index 671a552b..85094c98 100644 --- a/move_period_from_transaction_date/tests/test_reconciliation.py +++ b/move_period_from_transaction_date/tests/test_reconciliation.py @@ -2,11 +2,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# All Rights Reserved -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs # # 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 @@ -36,93 +31,68 @@ class TestReconciliation(TransactionCase): dates from different period. Created moves produced by reconciliation should take the period from the line date, not from the statement date. """ - cr, uid = self.cr, self.uid # Setup dates for testing: current_year = time.strftime('%Y') - invoice_date = '%s-07-01' % current_year # july - statement_date = '%s-09-01' % current_year # september - transaction_date = '%s-08-01' % current_year # august + invoice_date = '%s-07-01' % current_year # July + statement_date = '%s-09-01' % current_year # September + transaction_date = '%s-08-01' % current_year # August # Get references to demo data - data_model = self.registry('ir.model.data') - partner_agrolait_id = data_model.get_object_reference( - cr, uid, 'base', 'res_partner_2')[1] - account_rcv_id = data_model.get_object_reference( - cr, uid, 'account', 'a_recv')[1] - currency_usd_id = data_model.get_object_reference( - cr, uid, 'base', 'USD')[1] - bank_journal_usd_id = data_model.get_object_reference( - cr, uid, 'account', 'bank_journal_usd')[1] + partner_agrolait = self.env.ref('base.res_partner_2') + account_rcv = self.env.ref('account.a_recv') + currency_usd = self.env.ref('base.USD') + bank_journal_usd = self.env.ref('account.bank_journal_usd') # Get other models from registry: - period_model = self.registry('account.period') - account_invoice_model = self.registry('account.invoice') - account_invoice_line_model = self.registry('account.invoice.line') - statement_model = self.registry('account.bank.statement') - statement_line_model = self.registry('account.bank.statement.line') + account_invoice_model = self.env['account.invoice'] + statement_line_model = self.env['account.bank.statement.line'] # Create invoice in dollars: - invoice_id = account_invoice_model.create( - cr, uid, { - 'partner_id': partner_agrolait_id, - 'currency_id': currency_usd_id, - 'reference_type': 'none', - 'name': 'invoice to client', - 'account_id': account_rcv_id, - 'type': 'out_invoice', - 'date_invoice': invoice_date, - } - ) - account_invoice_line_model.create( - cr, uid, { - 'name': 'product that cost 100.00', - 'quantity': 1.0, - 'price_unit': 100.0, - 'invoice_id': invoice_id, - } - ) + invoice = account_invoice_model.create({ + 'partner_id': partner_agrolait.id, + 'currency_id': currency_usd.id, + 'reference_type': 'none', + 'name': 'invoice to client', + 'account_id': account_rcv.id, + 'type': 'out_invoice', + 'date_invoice': invoice_date, + }) + self.env['account.invoice.line'].create({ + 'name': 'product that cost 100.00', + 'quantity': 1.0, + 'price_unit': 100.0, + 'invoice_id': invoice.id, + }) # Validate sale: - account_invoice_model.signal_workflow( - cr, uid, [invoice_id], 'invoice_open') - invoice_record = account_invoice_model.browse(cr, uid, [invoice_id]) - # Bank statement from september: - bank_stmt_id = statement_model.create( - cr, uid, { - 'journal_id': bank_journal_usd_id, - 'date': statement_date, - } - ) - # Transaction from august: - bank_stmt_line_id = statement_line_model.create( - cr, uid, { - 'name': 'complete payment', - 'statement_id': bank_stmt_id, - 'partner_id': partner_agrolait_id, - 'amount': 100.00, - 'date': transaction_date, - } - ) + invoice.signal_workflow('invoice_open') + # Bank statement from September: + bank_stmt = self.env['account.bank.statement'].create({ + 'journal_id': bank_journal_usd.id, + 'date': statement_date, + }) + # Transaction from August: + bank_stmt_line = statement_line_model.create({ + 'name': 'complete payment', + 'statement_id': bank_stmt.id, + 'partner_id': partner_agrolait.id, + 'amount': 100.00, + 'date': transaction_date, + }) # Reconcile the payment with the invoice: - for l in invoice_record.move_id.line_id: - if l.account_id.id == account_rcv_id: - line_id = l + for l in invoice.move_id.line_id: + if l.account_id == account_rcv: + line = l break statement_line_model.process_reconciliation( - cr, uid, bank_stmt_line_id, [{ - 'counterpart_move_line_id': line_id.id, + bank_stmt_line.id, [{ + 'counterpart_move_line_id': line.id, 'credit': 100.0, 'debit': 0.0, - 'name': line_id.name, - }] - ) + 'name': line.name, + }]) # Get period for transaction date: - test_period_id = period_model.find(cr, uid, dt=transaction_date)[0] - # Get move lines for bank statement: - move_line_ids = statement_model.browse( - cr, uid, bank_stmt_id).move_line_ids + test_period = self.env['account.period'].find(dt=transaction_date)[0] # Period in move line for bank transaction, and for move should equal # period from transaction: - for move_line in move_line_ids: + for move_line in bank_stmt.move_line_ids: self.assertEquals( - move_line.period_id.id, test_period_id) + move_line.period_id, test_period) self.assertEquals( - move_line.move_id.period_id.id, test_period_id) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + move_line.move_id.period_id, test_period) From 044d6ded8acba0966efd947897da2bc165026229 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Fri, 3 Jul 2015 12:47:27 +0200 Subject: [PATCH 12/14] [RFR] Conformity --- move_period_from_transaction_date/README.rst | 2 -- move_period_from_transaction_date/model/__init__.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/move_period_from_transaction_date/README.rst b/move_period_from_transaction_date/README.rst index 17a64cd9..faad7be0 100644 --- a/move_period_from_transaction_date/README.rst +++ b/move_period_from_transaction_date/README.rst @@ -36,5 +36,3 @@ mission is to support the collaborative development of Odoo features and promote its widespread use. To contribute to this module, please visit http://odoo-community.org. - - diff --git a/move_period_from_transaction_date/model/__init__.py b/move_period_from_transaction_date/model/__init__.py index 5f24b18c..60b47c96 100644 --- a/move_period_from_transaction_date/model/__init__.py +++ b/move_period_from_transaction_date/model/__init__.py @@ -3,7 +3,6 @@ ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# All Rights Reserved # # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential @@ -26,5 +25,3 @@ from . import account_bank_statement_line from . import account_bank_statement from . import account_move_line - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From ecbe88947980c36f67b2a0bd4d4450cba193f77c Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Mon, 6 Jul 2015 17:42:34 +0200 Subject: [PATCH 13/14] [RFR] Conformity --- move_period_from_transaction_date/README.rst | 4 ++-- move_period_from_transaction_date/__init__.py | 3 +-- move_period_from_transaction_date/__openerp__.py | 2 +- move_period_from_transaction_date/model/__init__.py | 3 +-- .../model/account_bank_statement.py | 1 - .../model/account_bank_statement_line.py | 1 - move_period_from_transaction_date/model/account_move_line.py | 1 - move_period_from_transaction_date/tests/__init__.py | 4 ---- 8 files changed, 5 insertions(+), 14 deletions(-) diff --git a/move_period_from_transaction_date/README.rst b/move_period_from_transaction_date/README.rst index faad7be0..5344bdfe 100644 --- a/move_period_from_transaction_date/README.rst +++ b/move_period_from_transaction_date/README.rst @@ -1,8 +1,8 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 -Module name -=========== +Use bank transaction date to determine move period +================================================== By default, a bank statement in Odoo has its own period, and this period will be assigned to all the moves generated from the bank statement lines, diff --git a/move_period_from_transaction_date/__init__.py b/move_period_from_transaction_date/__init__.py index d95af88e..6adba3fc 100644 --- a/move_period_from_transaction_date/__init__.py +++ b/move_period_from_transaction_date/__init__.py @@ -1,5 +1,4 @@ -# -*- encoding: utf-8 -*- -"""Import python modules.""" +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. diff --git a/move_period_from_transaction_date/__openerp__.py b/move_period_from_transaction_date/__openerp__.py index 87abdb06..3dfa7e65 100644 --- a/move_period_from_transaction_date/__openerp__.py +++ b/move_period_from_transaction_date/__openerp__.py @@ -18,7 +18,7 @@ # ############################################################################## { - 'name': 'Use bank transaction (line) date to determine move period', + 'name': 'Use bank transaction (line) date to determine move period', 'version': '1.0', 'author': 'Therp BV, Odoo Community Association (OCA)', 'category': 'Banking addons', diff --git a/move_period_from_transaction_date/model/__init__.py b/move_period_from_transaction_date/model/__init__.py index 60b47c96..a81d7cc0 100644 --- a/move_period_from_transaction_date/model/__init__.py +++ b/move_period_from_transaction_date/model/__init__.py @@ -1,5 +1,4 @@ -# -*- encoding: utf-8 -*- -"""Import python modules extending orm models.""" +# -*- coding: utf-8 -*- ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. diff --git a/move_period_from_transaction_date/model/account_bank_statement.py b/move_period_from_transaction_date/model/account_bank_statement.py index 23cacc33..affcda7d 100644 --- a/move_period_from_transaction_date/model/account_bank_statement.py +++ b/move_period_from_transaction_date/model/account_bank_statement.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -"""Extend account.bank.statement to use transaction date in moves.""" ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. diff --git a/move_period_from_transaction_date/model/account_bank_statement_line.py b/move_period_from_transaction_date/model/account_bank_statement_line.py index 429c2b43..668c7e10 100644 --- a/move_period_from_transaction_date/model/account_bank_statement_line.py +++ b/move_period_from_transaction_date/model/account_bank_statement_line.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -"""Extend account.bank.statement.line to use transaction date in moves.""" ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. diff --git a/move_period_from_transaction_date/model/account_move_line.py b/move_period_from_transaction_date/model/account_move_line.py index 4fb0d089..d620b5fd 100644 --- a/move_period_from_transaction_date/model/account_move_line.py +++ b/move_period_from_transaction_date/model/account_move_line.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -"""Extend account.move.line to use date for period, when requested.""" ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. diff --git a/move_period_from_transaction_date/tests/__init__.py b/move_period_from_transaction_date/tests/__init__.py index 7c5e01ac..c4c08562 100644 --- a/move_period_from_transaction_date/tests/__init__.py +++ b/move_period_from_transaction_date/tests/__init__.py @@ -1,8 +1,6 @@ -"""Import unit tests.""" ############################################################################## # # Copyright (C) 2015 Therp BV - http://therp.nl. -# All Rights Reserved # # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential @@ -23,5 +21,3 @@ # ############################################################################## from . import test_reconciliation - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From fde20c07354e87eb93a5eb1190d7a464a16ce7dc Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 19 Aug 2015 08:48:26 +0200 Subject: [PATCH 14/14] [RFR] Rename [ADD] Runbot stanza in README [FIX] Whitespace --- .../README.rst | 19 ++++++++++++++++++ .../__init__.py | 0 .../__openerp__.py | 2 +- .../model/__init__.py | 0 .../model/account_bank_statement.py | 0 .../model/account_bank_statement_line.py | 0 .../model/account_move_line.py | 0 .../static/description/icon.png | Bin .../tests/__init__.py | 0 .../tests/test_reconciliation.py | 0 10 files changed, 20 insertions(+), 1 deletion(-) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/README.rst (57%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/__init__.py (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/__openerp__.py (99%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/model/__init__.py (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/model/account_bank_statement.py (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/model/account_bank_statement_line.py (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/model/account_move_line.py (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/static/description/icon.png (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/tests/__init__.py (100%) rename {move_period_from_transaction_date => account_bank_statement_period_from_line_date}/tests/test_reconciliation.py (100%) diff --git a/move_period_from_transaction_date/README.rst b/account_bank_statement_period_from_line_date/README.rst similarity index 57% rename from move_period_from_transaction_date/README.rst rename to account_bank_statement_period_from_line_date/README.rst index 5344bdfe..a67fde7e 100644 --- a/move_period_from_transaction_date/README.rst +++ b/account_bank_statement_period_from_line_date/README.rst @@ -16,6 +16,25 @@ generated for a bank transaction, the period for the moves is determined from the transaction (bank statement line) date, and not taken from the bank statement. +Usage +===== + +Just enter any bank statement with transactions on dates outside the accounting +period on the bank statement itself. When the moves are created, you will find +that these have the correct period set. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/98/8.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + Contributors ------------ diff --git a/move_period_from_transaction_date/__init__.py b/account_bank_statement_period_from_line_date/__init__.py similarity index 100% rename from move_period_from_transaction_date/__init__.py rename to account_bank_statement_period_from_line_date/__init__.py diff --git a/move_period_from_transaction_date/__openerp__.py b/account_bank_statement_period_from_line_date/__openerp__.py similarity index 99% rename from move_period_from_transaction_date/__openerp__.py rename to account_bank_statement_period_from_line_date/__openerp__.py index 3dfa7e65..87abdb06 100644 --- a/move_period_from_transaction_date/__openerp__.py +++ b/account_bank_statement_period_from_line_date/__openerp__.py @@ -18,7 +18,7 @@ # ############################################################################## { - 'name': 'Use bank transaction (line) date to determine move period', + 'name': 'Use bank transaction (line) date to determine move period', 'version': '1.0', 'author': 'Therp BV, Odoo Community Association (OCA)', 'category': 'Banking addons', diff --git a/move_period_from_transaction_date/model/__init__.py b/account_bank_statement_period_from_line_date/model/__init__.py similarity index 100% rename from move_period_from_transaction_date/model/__init__.py rename to account_bank_statement_period_from_line_date/model/__init__.py diff --git a/move_period_from_transaction_date/model/account_bank_statement.py b/account_bank_statement_period_from_line_date/model/account_bank_statement.py similarity index 100% rename from move_period_from_transaction_date/model/account_bank_statement.py rename to account_bank_statement_period_from_line_date/model/account_bank_statement.py diff --git a/move_period_from_transaction_date/model/account_bank_statement_line.py b/account_bank_statement_period_from_line_date/model/account_bank_statement_line.py similarity index 100% rename from move_period_from_transaction_date/model/account_bank_statement_line.py rename to account_bank_statement_period_from_line_date/model/account_bank_statement_line.py diff --git a/move_period_from_transaction_date/model/account_move_line.py b/account_bank_statement_period_from_line_date/model/account_move_line.py similarity index 100% rename from move_period_from_transaction_date/model/account_move_line.py rename to account_bank_statement_period_from_line_date/model/account_move_line.py diff --git a/move_period_from_transaction_date/static/description/icon.png b/account_bank_statement_period_from_line_date/static/description/icon.png similarity index 100% rename from move_period_from_transaction_date/static/description/icon.png rename to account_bank_statement_period_from_line_date/static/description/icon.png diff --git a/move_period_from_transaction_date/tests/__init__.py b/account_bank_statement_period_from_line_date/tests/__init__.py similarity index 100% rename from move_period_from_transaction_date/tests/__init__.py rename to account_bank_statement_period_from_line_date/tests/__init__.py diff --git a/move_period_from_transaction_date/tests/test_reconciliation.py b/account_bank_statement_period_from_line_date/tests/test_reconciliation.py similarity index 100% rename from move_period_from_transaction_date/tests/test_reconciliation.py rename to account_bank_statement_period_from_line_date/tests/test_reconciliation.py