From e69109610d41b3588bde29e9b60a17786848aace Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Tue, 15 Dec 2015 14:22:02 +0100 Subject: [PATCH 1/2] Add pos_payment_entries_globalization module --- pos_payment_entries_globalization/README.rst | 62 ++++ pos_payment_entries_globalization/__init__.py | 4 + .../__openerp__.py | 21 ++ .../models/__init__.py | 5 + .../models/account_journal.py | 15 + .../models/pos_session.py | 102 +++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 5 + .../test_pos_payment_entries_globalization.py | 271 ++++++++++++++++++ .../views/account_journal_view.xml | 19 ++ 10 files changed, 504 insertions(+) create mode 100644 pos_payment_entries_globalization/README.rst create mode 100644 pos_payment_entries_globalization/__init__.py create mode 100644 pos_payment_entries_globalization/__openerp__.py create mode 100644 pos_payment_entries_globalization/models/__init__.py create mode 100644 pos_payment_entries_globalization/models/account_journal.py create mode 100644 pos_payment_entries_globalization/models/pos_session.py create mode 100644 pos_payment_entries_globalization/static/description/icon.png create mode 100644 pos_payment_entries_globalization/tests/__init__.py create mode 100644 pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py create mode 100644 pos_payment_entries_globalization/views/account_journal_view.xml diff --git a/pos_payment_entries_globalization/README.rst b/pos_payment_entries_globalization/README.rst new file mode 100644 index 00000000..9200854e --- /dev/null +++ b/pos_payment_entries_globalization/README.rst @@ -0,0 +1,62 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +================================= +POS payment entries globalization +================================= + +This module allows to globalize payment entries created by the POS. + +In some cases, all banking transactions are received in a single bank statement line. +With this module, it's possible to reconcile this one line with the payment globalization line. + + +Configuration +============= + +To configure this module, you need to: + + * Configure globalize account and journal on POS payment method (Account journal). + +A globalization entry is generated for each globalization journal and each globalization account defined on payment methods. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/184/8.0 + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +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 `_. + +Credits +======= + +Contributors +------------ + +* Adrien Peiffer + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://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/pos_payment_entries_globalization/__init__.py b/pos_payment_entries_globalization/__init__.py new file mode 100644 index 00000000..bd895fe7 --- /dev/null +++ b/pos_payment_entries_globalization/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/pos_payment_entries_globalization/__openerp__.py b/pos_payment_entries_globalization/__openerp__.py new file mode 100644 index 00000000..c8d5c01d --- /dev/null +++ b/pos_payment_entries_globalization/__openerp__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': "POS payment entries globalization", + + 'summary': """ + Globalize POS Payment""", + 'author': 'ACSONE SA/NV,' + 'Odoo Community Association (OCA)', + 'website': "http://acsone.eu", + 'category': 'Point Of Sale', + 'version': '8.0.1.0.0', + 'license': 'AGPL-3', + 'depends': [ + 'point_of_sale', + ], + 'data': [ + 'views/account_journal_view.xml', + ], +} diff --git a/pos_payment_entries_globalization/models/__init__.py b/pos_payment_entries_globalization/models/__init__.py new file mode 100644 index 00000000..378a51d4 --- /dev/null +++ b/pos_payment_entries_globalization/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import account_journal +from . import pos_session diff --git a/pos_payment_entries_globalization/models/account_journal.py b/pos_payment_entries_globalization/models/account_journal.py new file mode 100644 index 00000000..2918bbdd --- /dev/null +++ b/pos_payment_entries_globalization/models/account_journal.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields + + +class AccountJournal(models.Model): + _inherit = 'account.journal' + + pos_payment_globalization = fields.Boolean() + pos_payment_globalization_account = fields.Many2one( + comodel_name='account.account') + pos_payment_globalization_journal = fields.Many2one( + comodel_name='account.journal') diff --git a/pos_payment_entries_globalization/models/pos_session.py b/pos_payment_entries_globalization/models/pos_session.py new file mode 100644 index 00000000..b8e824ac --- /dev/null +++ b/pos_payment_entries_globalization/models/pos_session.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields, api, _ +from collections import defaultdict + + +class PosSession(models.Model): + _inherit = 'pos.session' + + @api.multi + def _get_move_lines_for_globalization(self): + """ Get all move lines for globalization by journal-account""" + self.ensure_one() + grouped_move_lines = defaultdict(list) + for st in self.statement_ids: + if st.journal_id.pos_payment_globalization: + # One move per journal and account combination + key = (st.journal_id.pos_payment_globalization_account.id, + st.journal_id.pos_payment_globalization_journal.id) + debit_account_id =\ + st.journal_id.default_debit_account_id.id + lines = st.move_line_ids.filtered( + lambda r: r.account_id.id == debit_account_id) + grouped_move_lines[key].extend(lines) + return grouped_move_lines + + @api.model + def _create_globalization_move(self, journal_id, period_id): + """Create the globalization move""" + entries_vals = { + 'journal_id': journal_id, + 'period_id': period_id, + 'date': fields.Date.today(), + 'name': "%s - %s" % ( + self.name, _("Payment globalization")), + } + return self.env['account.move'].create(entries_vals) + + @api.model + def _create_globalization_counterpart_line(self, debit, credit, account_id, + move): + """Create the globalization counterpart line""" + item_vals = { + 'name': _("Payment globalization counterpart"), + 'credit': credit, + 'debit': debit, + 'account_id': account_id, + 'move_id': move.id + } + return self.env['account.move.line'].create(item_vals) + + @api.model + def _create_reverse_line(self, line_to_reverse, move): + """Create move line the reverse payment line in entries + genereted by pos""" + item_vals = { + 'name': "%s - %s" % ( + line_to_reverse.name, _("Payment globalization")), + 'credit': line_to_reverse.debit, + 'debit': line_to_reverse.credit, + 'account_id': line_to_reverse.account_id.id, + 'move_id': move.id + } + return self.env['account.move.line'].create(item_vals) + + @api.multi + def _generate_globalization_entries(self): + """Generate globalization moves""" + self.ensure_one() + grouped_move_lines = self._get_move_lines_for_globalization() + to_reconcile = [] + period = self.env['account.period'].find() + for key, lines in grouped_move_lines.iteritems(): + global_account_id, global_journal_id = key + move = self._create_globalization_move(global_journal_id, + period.id) + counterpart_debit = 0.0 + counterpart_credit = 0.0 + for line in lines: + counterpart_debit += line.debit + counterpart_credit += line.credit + new_line = self._create_reverse_line(line, move) + # Pair to reconcile : payment line and the reverse line + to_reconcile.append(line + new_line) + if counterpart_debit: + self._create_globalization_counterpart_line( + counterpart_debit, 0.0, global_account_id, move) + if counterpart_credit: + self._create_globalization_counterpart_line( + 0.0, counterpart_credit, global_account_id, move) + for lines in to_reconcile: + lines.reconcile() + + @api.multi + def wkf_action_close(self): + res = super(PosSession, self).wkf_action_close() + for record in self: + # Call the method to generate globalization entries + record._generate_globalization_entries() + return res diff --git a/pos_payment_entries_globalization/static/description/icon.png b/pos_payment_entries_globalization/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/pos_payment_entries_globalization/tests/__init__.py b/pos_payment_entries_globalization/tests/__init__.py new file mode 100644 index 00000000..e954b8e9 --- /dev/null +++ b/pos_payment_entries_globalization/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_pos_payment_entries_globalization diff --git a/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py b/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py new file mode 100644 index 00000000..b13dee1a --- /dev/null +++ b/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py @@ -0,0 +1,271 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.tests import common + + +class TestPosPaymentEntriesGlobalization(common.TransactionCase): + + def setUp(self): + super(TestPosPaymentEntriesGlobalization, self).setUp() + self.move_line_obj = self.env['account.move.line'] + self.pos_session_obj = self.env['pos.session'] + self.pos_order_obj = self.env['pos.order'] + self.main_config = self.env.ref('point_of_sale.pos_config_main') + self.payment_method_01 = self.env.ref('account.cash_journal') + self.payment_method_02 = self.env.ref('account.bank_journal') + self.payment_method_02.default_debit_account_id.reconcile = True + self.payment_method_03 = self.env.ref('account.check_journal') + self.payment_method_03.default_debit_account_id.reconcile = True + self.income_account = self.env.ref('account.o_income') + self.income_account_02 = self.income_account.copy() + self.misc_journal = self.env.ref('account.miscellaneous_journal') + self.misc_journal_02 = self.misc_journal.copy() + self.product_01 = self.env.ref('point_of_sale.perrier_50cl') + + def open_session(self): + # I create and open a new session + session = self.pos_session_obj.create( + {'config_id': self.main_config.id}) + ctx = self.env.context.copy() + # context is updated in open_cb + # -> Need to call with old api to give unfrozen context + self.registry['pos.session'].open_cb( + self.cr, self.uid, [session.id], context=ctx) + return session + + def create_order(self, amount, session): + # I create a new order + order_vals = { + 'session_id': session.id, + 'lines': [(0, 0, {'product_id': self.product_01.id, + 'price_unit': amount, + })] + } + return self.pos_order_obj.create(order_vals) + + def test_globalization_0(self): + session = self.open_session() + self.payment_method_02.pos_payment_globalization = True + self.payment_method_02.pos_payment_globalization_account =\ + self.income_account + self.payment_method_02.pos_payment_globalization_journal =\ + self.misc_journal + # I create a new order + order_01 = self.create_order(100, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_02.id} + self.pos_order_obj.add_payment(order_01.id, payment_data) + if order_01.test_paid(): + order_01.signal_workflow('paid') + # I create a new order + order_02 = self.create_order(100, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_02.id} + self.pos_order_obj.add_payment(order_02.id, payment_data) + if order_02.test_paid(): + order_02.signal_workflow('paid') + # I close the session + session.signal_workflow('close') + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account.id), + ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 200, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 2) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) + + def test_globalization_1(self): + session = self.open_session() + self.payment_method_02.pos_payment_globalization = True + self.payment_method_02.pos_payment_globalization_account =\ + self.income_account + self.payment_method_02.pos_payment_globalization_journal =\ + self.misc_journal + self.payment_method_03.pos_payment_globalization = True + self.payment_method_03.pos_payment_globalization_account =\ + self.income_account_02 + self.payment_method_03.pos_payment_globalization_journal =\ + self.misc_journal + # I create a new order + order_01 = self.create_order(100, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_02.id} + self.pos_order_obj.add_payment(order_01.id, payment_data) + if order_01.test_paid(): + order_01.signal_workflow('paid') + # I create a new order + order_02 = self.create_order(100, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_03.id} + self.pos_order_obj.add_payment(order_02.id, payment_data) + if order_02.test_paid(): + order_02.signal_workflow('paid') + # I close the session + session.signal_workflow('close') + # I check the first globalization account + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account.id), + ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 100, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 1) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) + # I check the second globalization account + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account_02.id), + ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 100, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 1) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) + + def test_globalization_2(self): + session = self.open_session() + self.payment_method_02.pos_payment_globalization = True + self.payment_method_02.pos_payment_globalization_account =\ + self.income_account + self.payment_method_02.pos_payment_globalization_journal =\ + self.misc_journal + self.payment_method_03.pos_payment_globalization = True + self.payment_method_03.pos_payment_globalization_account =\ + self.income_account_02 + self.payment_method_03.pos_payment_globalization_journal =\ + self.misc_journal + # I create a new order + order_01 = self.create_order(200, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_02.id} + self.pos_order_obj.add_payment(order_01.id, payment_data) + payment_data = {'amount': 100, + 'journal': self.payment_method_03.id} + self.pos_order_obj.add_payment(order_01.id, payment_data) + if order_01.test_paid(): + order_01.signal_workflow('paid') + # I close the session + session.signal_workflow('close') + # I check the first globalization account + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account.id), + ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 100, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 1) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) + # I check the second globalization account + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account_02.id), + ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 100, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 1) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) + + def test_globalization_3(self): + session = self.open_session() + self.payment_method_02.pos_payment_globalization = True + self.payment_method_02.pos_payment_globalization_account =\ + self.income_account + self.payment_method_02.pos_payment_globalization_journal =\ + self.misc_journal + self.payment_method_03.pos_payment_globalization = True + self.payment_method_03.pos_payment_globalization_account =\ + self.income_account + self.payment_method_03.pos_payment_globalization_journal =\ + self.misc_journal_02 + # I create a new order + order_01 = self.create_order(100, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_02.id} + self.pos_order_obj.add_payment(order_01.id, payment_data) + if order_01.test_paid(): + order_01.signal_workflow('paid') + # I create a new order + order_02 = self.create_order(100, session) + # I pay the created order + payment_data = {'amount': 100, + 'journal': self.payment_method_03.id} + self.pos_order_obj.add_payment(order_02.id, payment_data) + if order_02.test_paid(): + order_02.signal_workflow('paid') + # I close the session + session.signal_workflow('close') + # I check the first globalization journal + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account.id), + ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 100, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 1) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) + # I check the second globalization journal + move_line = self.move_line_obj.search( + [('account_id', '=', self.income_account.id), + ('journal_id', '=', self.misc_journal_02.id)]) + # I check that there is only one move line + self.assertEqual(len(move_line.ids), 1) + self.assertAlmostEqual(move_line.debit, 100, 2) + domain = [('move_id', '=', move_line.move_id.id), + ('id', '!=', move_line.id)] + reverse_lines = self.move_line_obj.search(domain) + # I ensure that the move contains reverse lines + self.assertEqual(len(reverse_lines), 1) + # I ensure reverse lines are reconciled + not_reconcile_reverse_lines = reverse_lines.filtered( + lambda r: not r.reconcile_ref) + self.assertEqual(len(not_reconcile_reverse_lines), 0) diff --git a/pos_payment_entries_globalization/views/account_journal_view.xml b/pos_payment_entries_globalization/views/account_journal_view.xml new file mode 100644 index 00000000..8cd9764d --- /dev/null +++ b/pos_payment_entries_globalization/views/account_journal_view.xml @@ -0,0 +1,19 @@ + + + + + POS Journal (pos_payment_entries_globalization) + account.journal + + + + + + + + + + + + + From 1d655173d6893fa193fb6a44f43fabbd2cc4ba1e Mon Sep 17 00:00:00 2001 From: gilles Date: Tue, 23 May 2017 12:44:12 +0200 Subject: [PATCH 2/2] [MIG] pos_payment_entries_globalization --- pos_payment_entries_globalization/README.rst | 7 +- pos_payment_entries_globalization/__init__.py | 3 - .../{__openerp__.py => __manifest__.py} | 9 +- .../models/__init__.py | 3 - .../models/account_journal.py | 4 +- .../models/pos_session.py | 33 +- .../tests/__init__.py | 4 - .../test_pos_payment_entries_globalization.py | 318 ++++++++++++------ .../views/account_journal_view.xml | 6 +- .../odoo/__init__.py | 1 + .../odoo/addons/__init__.py | 1 + .../addons/pos_payment_entries_globalization | 1 + .../setup.py | 6 + 13 files changed, 247 insertions(+), 149 deletions(-) rename pos_payment_entries_globalization/{__openerp__.py => __manifest__.py} (73%) create mode 100644 setup/pos_payment_entries_globalization/odoo/__init__.py create mode 100644 setup/pos_payment_entries_globalization/odoo/addons/__init__.py create mode 120000 setup/pos_payment_entries_globalization/odoo/addons/pos_payment_entries_globalization create mode 100644 setup/pos_payment_entries_globalization/setup.py diff --git a/pos_payment_entries_globalization/README.rst b/pos_payment_entries_globalization/README.rst index 9200854e..78da450c 100644 --- a/pos_payment_entries_globalization/README.rst +++ b/pos_payment_entries_globalization/README.rst @@ -17,7 +17,7 @@ Configuration To configure this module, you need to: - * Configure globalize account and journal on POS payment method (Account journal). + * Configure globalize account and journal on POS payment methods (Account journal). A globalization entry is generated for each globalization journal and each globalization account defined on payment methods. @@ -26,7 +26,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/184/8.0 + :target: https://runbot.odoo-community.org/runbot/184/10.0 For further information, please visit: @@ -47,6 +47,7 @@ Contributors ------------ * Adrien Peiffer +* Meyomesse Gilles Maintainer ---------- @@ -59,4 +60,4 @@ 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. +To contribute to this module, please visit http://odoo-community.org. \ No newline at end of file diff --git a/pos_payment_entries_globalization/__init__.py b/pos_payment_entries_globalization/__init__.py index bd895fe7..0650744f 100644 --- a/pos_payment_entries_globalization/__init__.py +++ b/pos_payment_entries_globalization/__init__.py @@ -1,4 +1 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/pos_payment_entries_globalization/__openerp__.py b/pos_payment_entries_globalization/__manifest__.py similarity index 73% rename from pos_payment_entries_globalization/__openerp__.py rename to pos_payment_entries_globalization/__manifest__.py index c8d5c01d..4c937a21 100644 --- a/pos_payment_entries_globalization/__openerp__.py +++ b/pos_payment_entries_globalization/__manifest__.py @@ -1,16 +1,14 @@ # -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () +# Copyright 2015-2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': "POS payment entries globalization", - - 'summary': """ - Globalize POS Payment""", + 'summary': """Globalize POS Payment""", 'author': 'ACSONE SA/NV,' 'Odoo Community Association (OCA)', 'website': "http://acsone.eu", 'category': 'Point Of Sale', - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'license': 'AGPL-3', 'depends': [ 'point_of_sale', @@ -18,4 +16,5 @@ 'data': [ 'views/account_journal_view.xml', ], + 'installable': True, } diff --git a/pos_payment_entries_globalization/models/__init__.py b/pos_payment_entries_globalization/models/__init__.py index 378a51d4..9b7ed82d 100644 --- a/pos_payment_entries_globalization/models/__init__.py +++ b/pos_payment_entries_globalization/models/__init__.py @@ -1,5 +1,2 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import account_journal from . import pos_session diff --git a/pos_payment_entries_globalization/models/account_journal.py b/pos_payment_entries_globalization/models/account_journal.py index 2918bbdd..6ac06586 100644 --- a/pos_payment_entries_globalization/models/account_journal.py +++ b/pos_payment_entries_globalization/models/account_journal.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () +# Copyright 2015-2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields +from odoo import models, fields class AccountJournal(models.Model): diff --git a/pos_payment_entries_globalization/models/pos_session.py b/pos_payment_entries_globalization/models/pos_session.py index b8e824ac..e2057252 100644 --- a/pos_payment_entries_globalization/models/pos_session.py +++ b/pos_payment_entries_globalization/models/pos_session.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () +# Copyright 2015-2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api, _ +from odoo import models, fields, api, _ from collections import defaultdict @@ -27,11 +27,10 @@ class PosSession(models.Model): return grouped_move_lines @api.model - def _create_globalization_move(self, journal_id, period_id): + def _prepare_globalization_move(self, journal_id): """Create the globalization move""" entries_vals = { 'journal_id': journal_id, - 'period_id': period_id, 'date': fields.Date.today(), 'name': "%s - %s" % ( self.name, _("Payment globalization")), @@ -39,8 +38,8 @@ class PosSession(models.Model): return self.env['account.move'].create(entries_vals) @api.model - def _create_globalization_counterpart_line(self, debit, credit, account_id, - move): + def _prepare_globalization_counterpart_line(self, debit, credit, + account_id, move): """Create the globalization counterpart line""" item_vals = { 'name': _("Payment globalization counterpart"), @@ -49,7 +48,8 @@ class PosSession(models.Model): 'account_id': account_id, 'move_id': move.id } - return self.env['account.move.line'].create(item_vals) + return self.env['account.move.line'].with_context( + {'check_move_validity': False}).create(item_vals) @api.model def _create_reverse_line(self, line_to_reverse, move): @@ -63,7 +63,11 @@ class PosSession(models.Model): 'account_id': line_to_reverse.account_id.id, 'move_id': move.id } - return self.env['account.move.line'].create(item_vals) + # case of reverse account move line don't check move validity + # because it will assert balanced move + # that need : sum(debit) - sum(credit) must be gt 0 + return self.env['account.move.line'].with_context( + {'check_move_validity': False}).create(item_vals) @api.multi def _generate_globalization_entries(self): @@ -71,11 +75,9 @@ class PosSession(models.Model): self.ensure_one() grouped_move_lines = self._get_move_lines_for_globalization() to_reconcile = [] - period = self.env['account.period'].find() for key, lines in grouped_move_lines.iteritems(): global_account_id, global_journal_id = key - move = self._create_globalization_move(global_journal_id, - period.id) + move = self._prepare_globalization_move(global_journal_id) counterpart_debit = 0.0 counterpart_credit = 0.0 for line in lines: @@ -85,18 +87,17 @@ class PosSession(models.Model): # Pair to reconcile : payment line and the reverse line to_reconcile.append(line + new_line) if counterpart_debit: - self._create_globalization_counterpart_line( + self._prepare_globalization_counterpart_line( counterpart_debit, 0.0, global_account_id, move) if counterpart_credit: - self._create_globalization_counterpart_line( + self._prepare_globalization_counterpart_line( 0.0, counterpart_credit, global_account_id, move) for lines in to_reconcile: lines.reconcile() @api.multi - def wkf_action_close(self): - res = super(PosSession, self).wkf_action_close() + def action_pos_session_closing_control(self): + super(PosSession, self).action_pos_session_closing_control() for record in self: # Call the method to generate globalization entries record._generate_globalization_entries() - return res diff --git a/pos_payment_entries_globalization/tests/__init__.py b/pos_payment_entries_globalization/tests/__init__.py index e954b8e9..2718af2b 100644 --- a/pos_payment_entries_globalization/tests/__init__.py +++ b/pos_payment_entries_globalization/tests/__init__.py @@ -1,5 +1 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - from . import test_pos_payment_entries_globalization diff --git a/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py b/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py index b13dee1a..911a4878 100644 --- a/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py +++ b/pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py @@ -2,77 +2,124 @@ # Copyright 2015 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests import common - - -class TestPosPaymentEntriesGlobalization(common.TransactionCase): - - def setUp(self): - super(TestPosPaymentEntriesGlobalization, self).setUp() - self.move_line_obj = self.env['account.move.line'] - self.pos_session_obj = self.env['pos.session'] - self.pos_order_obj = self.env['pos.order'] - self.main_config = self.env.ref('point_of_sale.pos_config_main') - self.payment_method_01 = self.env.ref('account.cash_journal') - self.payment_method_02 = self.env.ref('account.bank_journal') - self.payment_method_02.default_debit_account_id.reconcile = True - self.payment_method_03 = self.env.ref('account.check_journal') - self.payment_method_03.default_debit_account_id.reconcile = True - self.income_account = self.env.ref('account.o_income') - self.income_account_02 = self.income_account.copy() - self.misc_journal = self.env.ref('account.miscellaneous_journal') - self.misc_journal_02 = self.misc_journal.copy() - self.product_01 = self.env.ref('point_of_sale.perrier_50cl') - - def open_session(self): - # I create and open a new session - session = self.pos_session_obj.create( - {'config_id': self.main_config.id}) - ctx = self.env.context.copy() - # context is updated in open_cb - # -> Need to call with old api to give unfrozen context - self.registry['pos.session'].open_cb( - self.cr, self.uid, [session.id], context=ctx) - return session +from odoo.tests.common import SavepointCase + + +class TestPosPaymentEntriesGlobalization(SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestPosPaymentEntriesGlobalization, cls).setUpClass() + + cls.move_line_obj = cls.env['account.move.line'] + cls.pos_order_obj = cls.env['pos.order'] + cls.main_config = cls.env.ref('point_of_sale.pos_config_main') + cls.account_type = cls.env['account.account.type'] + cls.account_account = cls.env['account.account'] + cls.payment_method = cls.env['account.journal'] + cls.product_01 = cls.env.ref( + 'point_of_sale.product_product_consumable') + cls.pos_config = cls.env.ref('point_of_sale.pos_config_main') + cls.customer_01 = cls.env.ref('base.res_partner_2') + cls.pos_session_obj = cls.env['pos.session'] + + # MODELS + cls.account_type = cls.account_type.create({ + 'name': 'Bank and Cash', + 'type': 'liquidity', + 'include_initial_balance': True + }) + cls.income_account = cls.account_account.create({ + 'code': 'X11006', + 'name': 'Other Income', + 'user_type_id': cls.account_type.id, + }) + cls.income_account_02 = cls.income_account.copy() + cls.account_account = cls.account_account.create({ + 'code': 'Test X1014', + 'name': 'Bank Current Account - (test)', + 'user_type_id': cls.account_type.id, + 'reconcile': True + }) + + cls.payment_method_02 = cls.payment_method.create({ + 'name': 'Bank - Test', + 'code': 'TBNK', + 'type': 'bank', + 'default_debit_account_id': cls.account_account.id, + 'default_credit_account_id': cls.account_account.id + }) + + # next line + cls.payment_method_03 = cls.payment_method.create({ + 'name': 'Checks Journal - (test)', + 'code': 'TBNK', + 'type': 'bank', + 'default_debit_account_id': cls.account_account.id, + 'default_credit_account_id': cls.account_account.id + }) + + cls.misc_journal = cls.payment_method.create({ + 'name': 'Miscellaneous Journal - (test)', + 'code': 'TMIS', + 'type': 'general' + }) + cls.misc_journal_02 = cls.misc_journal.copy() def create_order(self, amount, session): # I create a new order order_vals = { 'session_id': session.id, + 'partner_id': self.customer_01.id, 'lines': [(0, 0, {'product_id': self.product_01.id, - 'price_unit': amount, - })] + 'price_unit': amount})] } return self.pos_order_obj.create(order_vals) def test_globalization_0(self): - session = self.open_session() + # add payment method + self.main_config.write( + {'journal_ids': [(6, 0, [self.payment_method_02.id])]}) + # Create and open a new session + self.session = self.pos_session_obj.create( + {'config_id': self.main_config.id}) + self.session.action_pos_session_open() + + # config pos payment globalization self.payment_method_02.pos_payment_globalization = True - self.payment_method_02.pos_payment_globalization_account =\ + self.payment_method_02.pos_payment_globalization_account = \ self.income_account - self.payment_method_02.pos_payment_globalization_journal =\ + self.payment_method_02.pos_payment_globalization_journal = \ self.misc_journal - # I create a new order - order_01 = self.create_order(100, session) + + # I create a new orders + order_01 = self.create_order(100, self.session) + order_02 = self.create_order(100, self.session) + # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_02.id} - self.pos_order_obj.add_payment(order_01.id, payment_data) + payment_data1 = {'amount': 100, + 'journal': self.payment_method_02.id, + 'partner_id': order_01.partner_id.id} + payment_data2 = {'amount': 100, + 'journal': self.payment_method_02.id, + 'partner_id': order_02.partner_id.id} + + # add payment to orders and pay + order_01.add_payment(payment_data1) if order_01.test_paid(): - order_01.signal_workflow('paid') - # I create a new order - order_02 = self.create_order(100, session) - # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_02.id} - self.pos_order_obj.add_payment(order_02.id, payment_data) + order_01.action_pos_order_paid() + + order_02.add_payment(payment_data2) if order_02.test_paid(): - order_02.signal_workflow('paid') - # I close the session - session.signal_workflow('close') + order_02.action_pos_order_paid() + + # close session + self.session.action_pos_session_closing_control() + move_line = self.move_line_obj.search( [('account_id', '=', self.income_account.id), ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line self.assertEqual(len(move_line.ids), 1) self.assertAlmostEqual(move_line.debit, 200, 2) @@ -83,43 +130,60 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 2) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) def test_globalization_1(self): - session = self.open_session() + # add payment method + self.main_config.write( + {'journal_ids': [(6, 0, [self.payment_method_02.id, + self.payment_method_03.id])] + }) + # Create and open a new session + self.session = self.pos_session_obj.create( + {'config_id': self.main_config.id}) + self.session.action_pos_session_open() + self.payment_method_02.pos_payment_globalization = True - self.payment_method_02.pos_payment_globalization_account =\ + self.payment_method_02.pos_payment_globalization_account = \ self.income_account - self.payment_method_02.pos_payment_globalization_journal =\ + self.payment_method_02.pos_payment_globalization_journal = \ self.misc_journal self.payment_method_03.pos_payment_globalization = True - self.payment_method_03.pos_payment_globalization_account =\ + self.payment_method_03.pos_payment_globalization_account = \ self.income_account_02 - self.payment_method_03.pos_payment_globalization_journal =\ + self.payment_method_03.pos_payment_globalization_journal = \ self.misc_journal + # I create a new order - order_01 = self.create_order(100, session) + order_01 = self.create_order(100, self.session) + order_02 = self.create_order(100, self.session) + # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_02.id} - self.pos_order_obj.add_payment(order_01.id, payment_data) + payment_data1 = {'amount': 100, + 'journal': self.payment_method_02.id, + 'partner_id': order_01.partner_id.id} + payment_data2 = {'amount': 100, + 'journal': self.payment_method_03.id, + 'partner_id': order_02.partner_id.id} + + # add payment to orders and pay + order_01.add_payment(payment_data1) if order_01.test_paid(): - order_01.signal_workflow('paid') - # I create a new order - order_02 = self.create_order(100, session) - # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_03.id} - self.pos_order_obj.add_payment(order_02.id, payment_data) + order_01.action_pos_order_paid() + + order_02.add_payment(payment_data2) if order_02.test_paid(): - order_02.signal_workflow('paid') - # I close the session - session.signal_workflow('close') + order_02.action_pos_order_paid() + + # close session + self.session.action_pos_session_closing_control() + # I check the first globalization account move_line = self.move_line_obj.search( [('account_id', '=', self.income_account.id), ('journal_id', '=', self.misc_journal.id)]) + # I check that there is only one move line self.assertEqual(len(move_line.ids), 1) self.assertAlmostEqual(move_line.debit, 100, 2) @@ -130,7 +194,7 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 1) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) # I check the second globalization account move_line = self.move_line_obj.search( @@ -146,34 +210,52 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 1) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) def test_globalization_2(self): - session = self.open_session() + # add payment method + self.main_config.write({'journal_ids': [(6, 0, [ + self.payment_method_02.id, self.payment_method_03.id])]}) + # Create and open a new session + self.session = self.pos_session_obj.create( + {'config_id': self.main_config.id}) + self.session.action_pos_session_open() + self.payment_method_02.pos_payment_globalization = True - self.payment_method_02.pos_payment_globalization_account =\ + self.payment_method_02.pos_payment_globalization_account = \ self.income_account - self.payment_method_02.pos_payment_globalization_journal =\ + self.payment_method_02.pos_payment_globalization_journal = \ self.misc_journal self.payment_method_03.pos_payment_globalization = True - self.payment_method_03.pos_payment_globalization_account =\ + self.payment_method_03.pos_payment_globalization_account = \ self.income_account_02 - self.payment_method_03.pos_payment_globalization_journal =\ + self.payment_method_03.pos_payment_globalization_journal = \ self.misc_journal - # I create a new order - order_01 = self.create_order(200, session) + + # create orders + order_01 = self.create_order(100, self.session) + order_02 = self.create_order(100, self.session) + # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_02.id} - self.pos_order_obj.add_payment(order_01.id, payment_data) - payment_data = {'amount': 100, - 'journal': self.payment_method_03.id} - self.pos_order_obj.add_payment(order_01.id, payment_data) + payment_data1 = {'amount': 100, + 'journal': self.payment_method_02.id, + 'partner_id': order_01.partner_id.id} + payment_data2 = {'amount': 100, + 'journal': self.payment_method_03.id, + 'partner_id': order_02.partner_id.id} + + order_01.add_payment(payment_data1) if order_01.test_paid(): - order_01.signal_workflow('paid') - # I close the session - session.signal_workflow('close') + order_01.action_pos_order_paid() + + order_02.add_payment(payment_data2) + if order_02.test_paid(): + order_02.action_pos_order_paid() + + # close session + self.session.action_pos_session_closing_control() + # I check the first globalization account move_line = self.move_line_obj.search( [('account_id', '=', self.income_account.id), @@ -188,7 +270,7 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 1) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) # I check the second globalization account move_line = self.move_line_obj.search( @@ -204,11 +286,19 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 1) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) def test_globalization_3(self): - session = self.open_session() + # add payment method + self.main_config.write( + {'journal_ids': [(6, 0, [self.payment_method_02.id, + self.payment_method_03.id])]}) + # Create and open a new session + self.session = self.pos_session_obj.create( + {'config_id': self.main_config.id}) + self.session.action_pos_session_open() + self.payment_method_02.pos_payment_globalization = True self.payment_method_02.pos_payment_globalization_account =\ self.income_account @@ -219,24 +309,30 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.income_account self.payment_method_03.pos_payment_globalization_journal =\ self.misc_journal_02 - # I create a new order - order_01 = self.create_order(100, session) - # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_02.id} - self.pos_order_obj.add_payment(order_01.id, payment_data) + + # I create orders + order_01 = self.create_order(100, self.session) + order_02 = self.create_order(100, self.session) + + # I pay the created orders + payment_data1 = {'amount': 100, + 'journal': self.payment_method_02.id, + 'partner_id': order_02.partner_id.id} + payment_data2 = {'amount': 100, + 'journal': self.payment_method_03.id, + 'partner_id': order_02.partner_id.id} + + order_01.add_payment(payment_data1) if order_01.test_paid(): - order_01.signal_workflow('paid') - # I create a new order - order_02 = self.create_order(100, session) - # I pay the created order - payment_data = {'amount': 100, - 'journal': self.payment_method_03.id} - self.pos_order_obj.add_payment(order_02.id, payment_data) + order_01.action_pos_order_paid() + + order_02.add_payment(payment_data2) if order_02.test_paid(): - order_02.signal_workflow('paid') - # I close the session - session.signal_workflow('close') + order_02.action_pos_order_paid() + + # close session + self.session.action_pos_session_closing_control() + # I check the first globalization journal move_line = self.move_line_obj.search( [('account_id', '=', self.income_account.id), @@ -251,7 +347,7 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 1) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) # I check the second globalization journal move_line = self.move_line_obj.search( @@ -267,5 +363,5 @@ class TestPosPaymentEntriesGlobalization(common.TransactionCase): self.assertEqual(len(reverse_lines), 1) # I ensure reverse lines are reconciled not_reconcile_reverse_lines = reverse_lines.filtered( - lambda r: not r.reconcile_ref) + lambda r: not r.reconciled) self.assertEqual(len(not_reconcile_reverse_lines), 0) diff --git a/pos_payment_entries_globalization/views/account_journal_view.xml b/pos_payment_entries_globalization/views/account_journal_view.xml index 8cd9764d..6c47f632 100644 --- a/pos_payment_entries_globalization/views/account_journal_view.xml +++ b/pos_payment_entries_globalization/views/account_journal_view.xml @@ -1,5 +1,7 @@ - + + POS Journal (pos_payment_entries_globalization) @@ -16,4 +18,4 @@ - + diff --git a/setup/pos_payment_entries_globalization/odoo/__init__.py b/setup/pos_payment_entries_globalization/odoo/__init__.py new file mode 100644 index 00000000..de40ea7c --- /dev/null +++ b/setup/pos_payment_entries_globalization/odoo/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/pos_payment_entries_globalization/odoo/addons/__init__.py b/setup/pos_payment_entries_globalization/odoo/addons/__init__.py new file mode 100644 index 00000000..de40ea7c --- /dev/null +++ b/setup/pos_payment_entries_globalization/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/pos_payment_entries_globalization/odoo/addons/pos_payment_entries_globalization b/setup/pos_payment_entries_globalization/odoo/addons/pos_payment_entries_globalization new file mode 120000 index 00000000..dde5f795 --- /dev/null +++ b/setup/pos_payment_entries_globalization/odoo/addons/pos_payment_entries_globalization @@ -0,0 +1 @@ +../../../../pos_payment_entries_globalization \ No newline at end of file diff --git a/setup/pos_payment_entries_globalization/setup.py b/setup/pos_payment_entries_globalization/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/pos_payment_entries_globalization/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)