Browse Source

[MIG] pos_payment_entries_globalization

pull/325/head
gilles 7 years ago
committed by David
parent
commit
628963769c
  1. 7
      pos_payment_entries_globalization/README.rst
  2. 3
      pos_payment_entries_globalization/__init__.py
  3. 9
      pos_payment_entries_globalization/__manifest__.py
  4. 3
      pos_payment_entries_globalization/models/__init__.py
  5. 4
      pos_payment_entries_globalization/models/account_journal.py
  6. 33
      pos_payment_entries_globalization/models/pos_session.py
  7. 4
      pos_payment_entries_globalization/tests/__init__.py
  8. 318
      pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py
  9. 6
      pos_payment_entries_globalization/views/account_journal_view.xml

7
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 <adrien.peiffer@acsone.eu>
* Meyomesse Gilles <meyomesse.gilles@gmail.com>
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.

3
pos_payment_entries_globalization/__init__.py

@ -1,4 +1 @@
# -*- coding: utf-8 -*-
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import models

9
pos_payment_entries_globalization/__openerp__.py → pos_payment_entries_globalization/__manifest__.py

@ -1,16 +1,14 @@
# -*- coding: utf-8 -*-
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# Copyright 2015-2017 ACSONE SA/NV (<http://acsone.eu>)
# 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,
}

3
pos_payment_entries_globalization/models/__init__.py

@ -1,5 +1,2 @@
# -*- coding: utf-8 -*-
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import account_journal
from . import pos_session

4
pos_payment_entries_globalization/models/account_journal.py

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# Copyright 2015-2017 ACSONE SA/NV (<http://acsone.eu>)
# 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):

33
pos_payment_entries_globalization/models/pos_session.py

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# Copyright 2015-2017 ACSONE SA/NV (<http://acsone.eu>)
# 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

4
pos_payment_entries_globalization/tests/__init__.py

@ -1,5 +1 @@
# -*- coding: utf-8 -*-
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import test_pos_payment_entries_globalization

318
pos_payment_entries_globalization/tests/test_pos_payment_entries_globalization.py

@ -2,77 +2,124 @@
# Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
# 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)

6
pos_payment_entries_globalization/views/account_journal_view.xml

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<!-- Copyright 2015-2017 ACSONE SA/NV (<http://acsone.eu>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<odoo>
<data>
<record model="ir.ui.view" id="view_account_journal_pos_user_form">
<field name="name">POS Journal (pos_payment_entries_globalization)</field>
@ -16,4 +18,4 @@
</field>
</record>
</data>
</openerp>
</odoo>
Loading…
Cancel
Save