diff --git a/account_reconcile_reconciliation_date/README.rst b/account_reconcile_reconciliation_date/README.rst new file mode 100644 index 00000000..9abec966 --- /dev/null +++ b/account_reconcile_reconciliation_date/README.rst @@ -0,0 +1,74 @@ +=========================== +Account Reconciliation Date +=========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--reconcile-lightgray.png?logo=github + :target: https://github.com/OCA/account-reconcile/tree/14.0/account_reconcile_reconciliation_date + :alt: OCA/account-reconcile +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-reconcile-14-0/account-reconcile-14-0-account_reconcile_reconciliation_date + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/98/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module is designed to help users track when invoices and payments are reconciled + +**Table of contents** + +.. contents:: + :local: + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Open Source Integrators + +Contributors +~~~~~~~~~~~~ + +* Steven Campbell +* Ammar Officewala + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +This module is part of the `OCA/account-reconcile `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_reconcile_reconciliation_date/__init__.py b/account_reconcile_reconciliation_date/__init__.py new file mode 100644 index 00000000..84af717e --- /dev/null +++ b/account_reconcile_reconciliation_date/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/account_reconcile_reconciliation_date/__manifest__.py b/account_reconcile_reconciliation_date/__manifest__.py new file mode 100644 index 00000000..fe90f740 --- /dev/null +++ b/account_reconcile_reconciliation_date/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Reconciliation Date", + "summary": "Track Reconciliation Date of Payments and Invoices", + "version": "14.0.1.0.0", + "depends": ["account"], + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-reconcile", + "category": "Finance", + "license": "AGPL-3", + "data": ["views/account_move.xml", "views/account_payment.xml"], + "installable": True, +} diff --git a/account_reconcile_reconciliation_date/i18n/account_reconcile_reconciliation_date.pot b/account_reconcile_reconciliation_date/i18n/account_reconcile_reconciliation_date.pot new file mode 100644 index 00000000..2402e5d8 --- /dev/null +++ b/account_reconcile_reconciliation_date/i18n/account_reconcile_reconciliation_date.pot @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_reconciliation_date +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_reconcile_reconciliation_date +#: model:ir.model,name:account_reconcile_reconciliation_date.model_account_full_reconcile +msgid "Full Reconcile" +msgstr "" + +#. module: account_reconcile_reconciliation_date +#: model:ir.model,name:account_reconcile_reconciliation_date.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_reconcile_reconciliation_date +#: model:ir.model,name:account_reconcile_reconciliation_date.model_account_payment +msgid "Payments" +msgstr "" + +#. module: account_reconcile_reconciliation_date +#: model:ir.model.fields,field_description:account_reconcile_reconciliation_date.field_account_full_reconcile__reconciliation_date +#: model:ir.model.fields,field_description:account_reconcile_reconciliation_date.field_account_invoice__reconciliation_date +#: model:ir.model.fields,field_description:account_reconcile_reconciliation_date.field_account_payment__reconciliation_date +msgid "Reconciliation Date" +msgstr "" + diff --git a/account_reconcile_reconciliation_date/models/__init__.py b/account_reconcile_reconciliation_date/models/__init__.py new file mode 100644 index 00000000..587cc1d1 --- /dev/null +++ b/account_reconcile_reconciliation_date/models/__init__.py @@ -0,0 +1,6 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import account_full_reconcile +from . import account_move +from . import account_payment diff --git a/account_reconcile_reconciliation_date/models/account_full_reconcile.py b/account_reconcile_reconciliation_date/models/account_full_reconcile.py new file mode 100644 index 00000000..b652b850 --- /dev/null +++ b/account_reconcile_reconciliation_date/models/account_full_reconcile.py @@ -0,0 +1,30 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from datetime import date + +from odoo import api, fields, models + + +class AccountFullReconcile(models.Model): + _inherit = "account.full.reconcile" + _description = "Full Reconcile" + + reconciliation_date = fields.Date( + string="Reconciliation Date", default=date.today() + ) + + @api.model + def create(self, vals): + res = super().create(vals) + for reconcile_id in res: + for line_id in reconcile_id.reconciled_line_ids: + if line_id.payment_id: + line_id.payment_id.reconciliation_date = ( + reconcile_id.reconciliation_date + ) + if line_id.move_id: + line_id.move_id.reconciliation_date = ( + reconcile_id.reconciliation_date + ) + return res diff --git a/account_reconcile_reconciliation_date/models/account_move.py b/account_reconcile_reconciliation_date/models/account_move.py new file mode 100644 index 00000000..436f0def --- /dev/null +++ b/account_reconcile_reconciliation_date/models/account_move.py @@ -0,0 +1,10 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + reconciliation_date = fields.Date(string="Reconciliation Date") diff --git a/account_reconcile_reconciliation_date/models/account_payment.py b/account_reconcile_reconciliation_date/models/account_payment.py new file mode 100644 index 00000000..f59ef6ba --- /dev/null +++ b/account_reconcile_reconciliation_date/models/account_payment.py @@ -0,0 +1,10 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountPayment(models.Model): + _inherit = "account.payment" + + reconciliation_date = fields.Date(string="Reconciliation Date") diff --git a/account_reconcile_reconciliation_date/readme/CONTRIBUTORS.rst b/account_reconcile_reconciliation_date/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..c39c4246 --- /dev/null +++ b/account_reconcile_reconciliation_date/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Steven Campbell +* Ammar Officewala diff --git a/account_reconcile_reconciliation_date/readme/DESCRIPTION.rst b/account_reconcile_reconciliation_date/readme/DESCRIPTION.rst new file mode 100644 index 00000000..3389547b --- /dev/null +++ b/account_reconcile_reconciliation_date/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module is designed to help users track when invoices and payments are reconciled diff --git a/account_reconcile_reconciliation_date/static/description/icon.png b/account_reconcile_reconciliation_date/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/account_reconcile_reconciliation_date/static/description/icon.png differ diff --git a/account_reconcile_reconciliation_date/static/description/index.html b/account_reconcile_reconciliation_date/static/description/index.html new file mode 100644 index 00000000..91e8122d --- /dev/null +++ b/account_reconcile_reconciliation_date/static/description/index.html @@ -0,0 +1,420 @@ + + + + + + +Account Reconciliation Date + + + +
+

Account Reconciliation Date

+ + +

Beta License: AGPL-3 OCA/account-reconcile Translate me on Weblate Try me on Runbot

+

This module is designed to help users track when invoices and payments are reconciled

+

Table of contents

+ +
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Open Source Integrators
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

This module is part of the OCA/account-reconcile project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/account_reconcile_reconciliation_date/tests/__init__.py b/account_reconcile_reconciliation_date/tests/__init__.py new file mode 100644 index 00000000..5cbf2f9a --- /dev/null +++ b/account_reconcile_reconciliation_date/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_account_reconcile_reconciliation_date diff --git a/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py b/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py new file mode 100644 index 00000000..2554acee --- /dev/null +++ b/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py @@ -0,0 +1,211 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import time + +from odoo.addons.account.tests.common import AccountTestInvoicingCommon + + +class TestAccountReconcileReconciliationDate(AccountTestInvoicingCommon): + def setUp(self): + super(TestAccountReconcileReconciliationDate, self).setUp() + self.register_payments_model = self.env[ + "account.payment.register" + ].with_context(active_model="account.move") + self.payment_model = self.env["account.payment"] + self.invoice_model = self.env["account.move"] + self.invoice_line_model = self.env["account.move.line"] + self.acc_bank_stmt_model = self.env["account.bank.statement"] + self.acc_bank_stmt_line_model = self.env["account.bank.statement.line"] + + self.partner_agrolait = self.env.ref("base.res_partner_2") + self.partner_china_exp = self.env.ref("base.res_partner_3") + self.currency_chf_id = self.env.ref("base.CHF").id + self.currency_usd_id = self.env.ref("base.USD").id + self.currency_eur_id = self.env.ref("base.EUR").id + + company = self.env.ref("base.main_company") + self.cr.execute( + "UPDATE res_company SET currency_id = %s WHERE id = %s", + [self.currency_eur_id, company.id], + ) + self.product = self.env.ref("product.product_product_4") + self.payment_method_manual_in = self.env.ref( + "account.account_payment_method_manual_in" + ) + self.payment_method_manual_out = self.env.ref( + "account.account_payment_method_manual_out" + ) + + self.account_receivable = self.env["account.account"].search( + [ + ( + "user_type_id", + "=", + self.env.ref("account.data_account_type_receivable").id, + ) + ], + limit=1, + ) + self.account_payable = self.env["account.account"].search( + [ + ( + "user_type_id", + "=", + self.env.ref("account.data_account_type_payable").id, + ) + ], + limit=1, + ) + self.account_revenue = self.env["account.account"].search( + [ + ( + "user_type_id", + "=", + self.env.ref("account.data_account_type_revenue").id, + ) + ], + limit=1, + ) + + self.bank_journal_euro = self.env["account.journal"].search( + [("type", "=", "bank")], limit=1 + ) + self.account_eur = self.bank_journal_euro.default_account_id + + self.bank_journal_usd = self.env["account.journal"].create( + { + "name": "Bank US", + "type": "bank", + "code": "BNK68", + "currency_id": self.currency_usd_id, + } + ) + self.account_usd = self.bank_journal_usd.default_account_id + self.journal_id = self.env["account.journal"].search( + [("type", "=", "sale")], limit=1 + ) + self.transfer_account = ( + self.env["res.users"].browse(self.env.uid).company_id.transfer_account_id + ) + self.diff_income_account = ( + self.env["res.users"] + .browse(self.env.uid) + .company_id.income_currency_exchange_account_id + ) + self.diff_expense_account = ( + self.env["res.users"] + .browse(self.env.uid) + .company_id.expense_currency_exchange_account_id + ) + + def create_invoice( + self, + amount=100, + move_type="out_invoice", + currency_id=None, + partner=None, + account_id=None, + ): + """ Returns an open invoice """ + invoice = self.invoice_model.create( + { + "partner_id": partner or self.partner_agrolait.id, + "currency_id": currency_id or self.currency_eur_id, + "journal_id": self.journal_id.id, + "move_type": move_type, + "invoice_date": time.strftime("%Y") + "-06-26", + "invoice_line_ids": [ + ( + 0, + 0, + { + "product_id": self.product.id, + "quantity": 1, + "price_unit": amount, + "name": "something", + "account_id": self.journal_id.default_account_id.id, + }, + ) + ], + } + ) + invoice.action_post() + return invoice + + def reconcile( + self, liquidity_aml, amount=0.0, amount_currency=0.0, currency_id=None + ): + """ Reconcile a journal entry corresponding \ + to a payment with its bank statement line """ + bank_stmt = self.acc_bank_stmt_model.create( + { + "journal_id": liquidity_aml.journal_id.id, + "date": time.strftime("%Y") + "-07-15", + } + ) + bank_stmt_line = self.acc_bank_stmt_line_model.create( + { + "name": "payment", + "statement_id": bank_stmt.id, + "partner_id": self.partner_agrolait.id, + "amount": amount, + "amount_currency": amount_currency, + "currency_id": currency_id, + "date": time.strftime("%Y") + "-07-15", + } + ) + + bank_stmt_line.process_reconciliation(payment_aml_rec=liquidity_aml) + return bank_stmt + + def test_full_payment_process(self): + """ Create a payment for two invoices, \ + post it and reconcile it with a bank statement """ + inv_1 = self.create_invoice( + amount=100, + currency_id=self.currency_eur_id, + partner=self.partner_agrolait.id, + ) + inv_2 = self.create_invoice( + amount=200, + currency_id=self.currency_eur_id, + partner=self.partner_agrolait.id, + ) + + ctx = {"active_model": "account.move", "active_ids": [inv_1.id, inv_2.id]} + register_payments = self.register_payments_model.with_context(ctx).create( + { + "payment_date": time.strftime("%Y") + "-07-15", + "journal_id": self.bank_journal_euro.id, + "payment_method_id": self.payment_method_manual_in.id, + } + ) + register_payments.flush() + register_payments.action_create_payments() + payment = self.payment_model.search([], order="id desc", limit=1) + + self.assertAlmostEqual(payment.amount, 200) + self.assertEqual(payment.state, "posted") + self.assertEqual(payment.state, "posted") + self.assertEqual(inv_1.payment_state, "paid") + self.assertEqual(inv_2.payment_state, "paid") + + self.assertRecordValues( + payment.line_ids, + [ + { + "journal_id": self.bank_journal_euro.id, + "debit": 200.0, + "credit": 0.0, + }, + { + "journal_id": self.bank_journal_euro.id, + "debit": 0.0, + "credit": 200.0, + }, + ], + ) + + self.assertEqual(payment.state, "posted") + self.assertEqual(payment.reconciliation_date, inv_1.reconciliation_date) diff --git a/account_reconcile_reconciliation_date/views/account_move.xml b/account_reconcile_reconciliation_date/views/account_move.xml new file mode 100644 index 00000000..60bb0c4a --- /dev/null +++ b/account_reconcile_reconciliation_date/views/account_move.xml @@ -0,0 +1,17 @@ + + + + account.move.reconciliation.date + account.move + + + + + + + + + diff --git a/account_reconcile_reconciliation_date/views/account_payment.xml b/account_reconcile_reconciliation_date/views/account_payment.xml new file mode 100644 index 00000000..0088cbc8 --- /dev/null +++ b/account_reconcile_reconciliation_date/views/account_payment.xml @@ -0,0 +1,17 @@ + + + + account.payment.reconciliation.date + account.payment + + + + + + + + + diff --git a/setup/account_reconcile_reconciliation_date/odoo/addons/account_reconcile_reconciliation_date b/setup/account_reconcile_reconciliation_date/odoo/addons/account_reconcile_reconciliation_date new file mode 120000 index 00000000..12e4abc0 --- /dev/null +++ b/setup/account_reconcile_reconciliation_date/odoo/addons/account_reconcile_reconciliation_date @@ -0,0 +1 @@ +../../../../account_reconcile_reconciliation_date \ No newline at end of file diff --git a/setup/account_reconcile_reconciliation_date/setup.py b/setup/account_reconcile_reconciliation_date/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_reconcile_reconciliation_date/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)