diff --git a/account_reconciliation_widget_due_date/README.rst b/account_reconciliation_widget_due_date/README.rst new file mode 100644 index 00000000..3ee0acaf --- /dev/null +++ b/account_reconciliation_widget_due_date/README.rst @@ -0,0 +1,93 @@ +====================================== +Account Reconciliation Widget Due Date +====================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png + :target: https://odoo-community.org/page/development-status + :alt: Production/Stable +.. |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/13.0/account_reconciliation_widget_due_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-13-0/account-reconcile-13-0-account_reconciliation_widget_due_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/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds "Due date" field in Bank Statements Lines. +In reconciliation process add "Due date" field to use in validation process (use these date in Journal Items. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +#. Enable 'Show Full Accounting Features' +#. Go to *Invoicing > Overview*. +#. Locate the bank kanban card and import or create a new statement on it (Set some Date Due in some transaction). +#. Go to Reconcile process and validate transaction previously edited. +#. Go to Invoicing > Accounting > Journal Items and check Due date from items created. + +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 +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `__: + + * Víctor Martínez + +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. + +.. |maintainer-victoralmau| image:: https://github.com/victoralmau.png?size=40px + :target: https://github.com/victoralmau + :alt: victoralmau + +Current `maintainer `__: + +|maintainer-victoralmau| + +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_reconciliation_widget_due_date/__init__.py b/account_reconciliation_widget_due_date/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_reconciliation_widget_due_date/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_reconciliation_widget_due_date/__manifest__.py b/account_reconciliation_widget_due_date/__manifest__.py new file mode 100644 index 00000000..185e8eee --- /dev/null +++ b/account_reconciliation_widget_due_date/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Reconciliation Widget Due Date", + "version": "13.0.1.0.0", + "website": "https://github.com/OCA/account-reconcile", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["account"], + "maintainers": ["victoralmau"], + "development_status": "Production/Stable", + "data": ["views/account_bank_statement_line_view.xml", "views/assets.xml"], +} diff --git a/account_reconciliation_widget_due_date/i18n/account_reconciliation_widget_due_date.pot b/account_reconciliation_widget_due_date/i18n/account_reconciliation_widget_due_date.pot new file mode 100644 index 00000000..271bfc8f --- /dev/null +++ b/account_reconciliation_widget_due_date/i18n/account_reconciliation_widget_due_date.pot @@ -0,0 +1,45 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconciliation_widget_due_date +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-05-31 07:14+0000\n" +"PO-Revision-Date: 2021-05-31 07:14+0000\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_reconciliation_widget_due_date +#: model:ir.model,name:account_reconciliation_widget_due_date.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" + +#. module: account_reconciliation_widget_due_date +#: model:ir.model,name:account_reconciliation_widget_due_date.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "" + +#. module: account_reconciliation_widget_due_date +#: model:ir.model.fields,field_description:account_reconciliation_widget_due_date.field_account_bank_statement_line__date_due +msgid "Due date" +msgstr "" + +#. module: account_reconciliation_widget_due_date +#. openerp-web +#: code:addons/account_reconciliation_widget_due_date/static/src/js/reconciliation_model.js:0 +#, python-format +msgid "Open balance" +msgstr "" + +#. module: account_reconciliation_widget_due_date +#. openerp-web +#: code:addons/account_reconciliation_widget_due_date/static/src/js/reconciliation_renderer.js:0 +#, python-format +msgid "Select Due date" +msgstr "" diff --git a/account_reconciliation_widget_due_date/i18n/es.po b/account_reconciliation_widget_due_date/i18n/es.po new file mode 100644 index 00000000..98353a51 --- /dev/null +++ b/account_reconciliation_widget_due_date/i18n/es.po @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconciliation_widget_due_date +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-05-31 07:15+0000\n" +"PO-Revision-Date: 2021-05-31 09:15+0200\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"Language: es\n" +"X-Generator: Poedit 2.3\n" + +#. module: account_reconciliation_widget_due_date +#: model:ir.model,name:account_reconciliation_widget_due_date.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "Widget de reconciliación de cuenta" + +#. module: account_reconciliation_widget_due_date +#: model:ir.model,name:account_reconciliation_widget_due_date.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "Línea de extracto bancario" + +#. module: account_reconciliation_widget_due_date +#: model:ir.model.fields,field_description:account_reconciliation_widget_due_date.field_account_bank_statement_line__date_due +msgid "Due date" +msgstr "Fecha vencimiento" + +#. module: account_reconciliation_widget_due_date +#. openerp-web +#: code:addons/account_reconciliation_widget_due_date/static/src/js/reconciliation_model.js:0 +#, python-format +msgid "Open balance" +msgstr "Saldo pendiente" + +#. module: account_reconciliation_widget_due_date +#. openerp-web +#: code:addons/account_reconciliation_widget_due_date/static/src/js/reconciliation_renderer.js:0 +#, python-format +msgid "Select Due date" +msgstr "Seleccionar fecha vencimiento" diff --git a/account_reconciliation_widget_due_date/models/__init__.py b/account_reconciliation_widget_due_date/models/__init__.py new file mode 100644 index 00000000..48217a2a --- /dev/null +++ b/account_reconciliation_widget_due_date/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_bank_statement_line +from . import reconciliation_widget diff --git a/account_reconciliation_widget_due_date/models/account_bank_statement_line.py b/account_reconciliation_widget_due_date/models/account_bank_statement_line.py new file mode 100644 index 00000000..57240856 --- /dev/null +++ b/account_reconciliation_widget_due_date/models/account_bank_statement_line.py @@ -0,0 +1,10 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class AccountBankStatementLine(models.Model): + _inherit = "account.bank.statement.line" + + date_due = fields.Date(string="Due date") diff --git a/account_reconciliation_widget_due_date/models/reconciliation_widget.py b/account_reconciliation_widget_due_date/models/reconciliation_widget.py new file mode 100644 index 00000000..818a815f --- /dev/null +++ b/account_reconciliation_widget_due_date/models/reconciliation_widget.py @@ -0,0 +1,30 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import api, models +from odoo.tools.misc import format_date, parse_date + + +class AccountReconciliation(models.AbstractModel): + _inherit = "account.reconciliation.widget" + + @api.model + def _get_statement_line(self, st_line): + data = super()._get_statement_line(st_line) + data["date_due"] = format_date(self.env, st_line.date_due) + return data + + @api.model + def process_bank_statement_line(self, st_line_ids, data): + res = super().process_bank_statement_line(st_line_ids, data) + AccountMove = self.env["account.move"] + st_line_Move = self.env["account.bank.statement.line"] + key = 0 + for move in res["moves"]: + if "date_due" in data[key] and data[key]["date_due"]: + move_record = AccountMove.browse(move) + st_line = st_line_Move.browse(st_line_ids[key]) + st_line.date_due = parse_date(self.env, data[key]["date_due"]) + move_record.line_ids.date_maturity = st_line.date_due + key += 1 + return res diff --git a/account_reconciliation_widget_due_date/readme/CONTRIBUTORS.rst b/account_reconciliation_widget_due_date/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..ae3b3ea5 --- /dev/null +++ b/account_reconciliation_widget_due_date/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `__: + + * Víctor Martínez diff --git a/account_reconciliation_widget_due_date/readme/DESCRIPTION.rst b/account_reconciliation_widget_due_date/readme/DESCRIPTION.rst new file mode 100644 index 00000000..afdf604e --- /dev/null +++ b/account_reconciliation_widget_due_date/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module adds "Due date" field in Bank Statements Lines. +In reconciliation process add "Due date" field to use in validation process (use these date in Journal Items. diff --git a/account_reconciliation_widget_due_date/readme/USAGE.rst b/account_reconciliation_widget_due_date/readme/USAGE.rst new file mode 100644 index 00000000..363cf901 --- /dev/null +++ b/account_reconciliation_widget_due_date/readme/USAGE.rst @@ -0,0 +1,5 @@ +#. Enable 'Show Full Accounting Features' +#. Go to *Invoicing > Overview*. +#. Locate the bank kanban card and import or create a new statement on it (Set some Date Due in some transaction). +#. Go to Reconcile process and validate transaction previously edited. +#. Go to Invoicing > Accounting > Journal Items and check Due date from items created. diff --git a/account_reconciliation_widget_due_date/static/description/icon.png b/account_reconciliation_widget_due_date/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/account_reconciliation_widget_due_date/static/description/icon.png differ diff --git a/account_reconciliation_widget_due_date/static/description/index.html b/account_reconciliation_widget_due_date/static/description/index.html new file mode 100644 index 00000000..f8bfcb63 --- /dev/null +++ b/account_reconciliation_widget_due_date/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Account Reconciliation Widget Due Date + + + +
+

Account Reconciliation Widget Due Date

+ + +

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

+

This module adds “Due date” field in Bank Statements Lines. +In reconciliation process add “Due date” field to use in validation process (use these date in Journal Items.

+

Table of contents

+ +
+

Usage

+
    +
  1. Enable ‘Show Full Accounting Features’
    2. +
  2. Go to Invoicing > Overview.
    3. +
  3. Locate the bank kanban card and import or create a new statement on it (Set some Date Due in some transaction).
    4. +
  4. Go to Reconcile process and validate transaction previously edited.
    5. +
  5. Go to Invoicing > Accounting > Journal Items and check Due date from items created.
    6. +
+
+
+

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

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

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.

+

Current maintainer:

+

victoralmau

+

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_reconciliation_widget_due_date/static/src/js/reconciliation_action.js b/account_reconciliation_widget_due_date/static/src/js/reconciliation_action.js new file mode 100644 index 00000000..e1b91c14 --- /dev/null +++ b/account_reconciliation_widget_due_date/static/src/js/reconciliation_action.js @@ -0,0 +1,17 @@ +odoo.define( + "account_reconciliation_widget_due_date.ReconciliationClientAction", + function(require) { + "use strict"; + var action = require("account.ReconciliationClientAction"); + + action.StatementAction.include({ + custom_events: _.extend( + {}, + action.StatementAction.prototype.custom_events, + { + change_date_due: "_onAction", + } + ), + }); + } +); diff --git a/account_reconciliation_widget_due_date/static/src/js/reconciliation_model.js b/account_reconciliation_widget_due_date/static/src/js/reconciliation_model.js new file mode 100644 index 00000000..1c6be636 --- /dev/null +++ b/account_reconciliation_widget_due_date/static/src/js/reconciliation_model.js @@ -0,0 +1,155 @@ +/* eslint-disable init-declarations */ +/* eslint-disable-line no-shadow */ +odoo.define("account_reconciliation_widget_due_date.ReconciliationModel", function( + require +) { + "use strict"; + + var Model = require("account.ReconciliationModel"); + var utils = require("web.utils"); + var session = require("web.session"); + var core = require("web.core"); + var _t = core._t; + Model.StatementModel.include({ + changeDateDue: function(handle, date_due, preserveMode) { + var self = this; + var line = this.getLine(handle); + line.st_line.date_due = date_due; + return Promise.resolve(date_due) + .then(function() { + return self._computeLine(line); + }) + .then(function() { + return self.changeMode( + handle, + preserveMode ? line.mode : "default", + true + ); + }); + }, + validate: function(handle) { + var self = this; + this.display_context = "validate"; + var handles = []; + if (handle) { + handles = [handle]; + } else { + _.each(this.lines, function(line, handle) { + if ( + !line.reconciled && + line.balance && + !line.balance.amount && + line.reconciliation_proposition.length + ) { + handles.push(handle); + } + }); + } + var ids = []; + var values = []; + var handlesPromises = []; + _.each(handles, function(handle) { + var line = self.getLine(handle); + var props = _.filter(line.reconciliation_proposition, function(prop) { + return !prop.invalid; + }); + var computeLinePromise; + if (props.length === 0) { + // Usability: if user has not chosen any lines and click validate, it has the same behavior + // as creating a write-off of the same amount. + props.push( + self._formatQuickCreate(line, { + account_id: [ + line.st_line.open_balance_account_id, + self.accounts[line.st_line.open_balance_account_id], + ], + }) + ); + // Update balance of line otherwise it won't be to zero and another line will be added + line.reconciliation_proposition.push(props[0]); + computeLinePromise = self._computeLine(line); + } + ids.push(line.id); + handlesPromises.push( + Promise.resolve(computeLinePromise).then(function() { + var values_dict = { + partner_id: line.st_line.partner_id, + counterpart_aml_dicts: _.map( + _.filter(props, function(prop) { + return !isNaN(prop.id) && !prop.already_paid; + }), + self._formatToProcessReconciliation.bind(self, line) + ), + payment_aml_ids: _.pluck( + _.filter(props, function(prop) { + return !isNaN(prop.id) && prop.already_paid; + }), + "id" + ), + new_aml_dicts: _.map( + _.filter(props, function(prop) { + return isNaN(prop.id) && prop.display; + }), + self._formatToProcessReconciliation.bind(self, line) + ), + to_check: line.to_check, + date_due: line.st_line.date_due, + }; + + // If the lines are not fully balanced, create an unreconciled amount. + // line.st_line.currency_id is never false here because its equivalent to + // statement_line.currency_id or statement_line.journal_id.currency_id or statement_line.journal_id.company_id.currency_id (Python-side). + // see: get_statement_line_for_reconciliation_widget method in account/models/account_bank_statement.py for more details + var currency = session.get_currency(line.st_line.currency_id); + var balance = line.balance.amount; + if (!utils.float_is_zero(balance, currency.digits[1])) { + var unreconciled_amount_dict = { + account_id: line.st_line.open_balance_account_id, + credit: balance > 0 ? balance : 0, + debit: balance < 0 ? -balance : 0, + name: line.st_line.name + " : " + _t("Open balance"), + }; + values_dict.new_aml_dicts.push(unreconciled_amount_dict); + } + values.push(values_dict); + line.reconciled = true; + }) + ); + + _.each(self.lines, function(other_line) { + if (other_line != line) { + var filtered_prop = other_line.reconciliation_proposition.filter( + p => + !line.reconciliation_proposition + .map(l => l.id) + .includes(p.id) + ); + if ( + filtered_prop.length != + other_line.reconciliation_proposition.length + ) { + other_line.need_update = true; + other_line.reconciliation_proposition = filtered_prop; + } + self._computeLine(line); + } + }); + }); + + return Promise.all(handlesPromises).then(function() { + return self + ._rpc({ + model: "account.reconciliation.widget", + method: "process_bank_statement_line", + args: [ids, values], + context: self.context, + }) + .then(self._validatePostProcess.bind(self)) + .then(function() { + self.valuenow += handles.length; + return {handles: handles}; + }); + }); + }, + }); +}); diff --git a/account_reconciliation_widget_due_date/static/src/js/reconciliation_renderer.js b/account_reconciliation_widget_due_date/static/src/js/reconciliation_renderer.js new file mode 100644 index 00000000..c29c1eff --- /dev/null +++ b/account_reconciliation_widget_due_date/static/src/js/reconciliation_renderer.js @@ -0,0 +1,52 @@ +odoo.define("account_reconciliation_widget_due_date.ReconciliationRenderer", function( + require +) { + "use strict"; + + var renderer = require("account.ReconciliationRenderer"); + var basic_fields = require("web.basic_fields"); + var core = require("web.core"); + var _t = core._t; + + renderer.LineRenderer.include({ + _onFieldChanged: function(event) { + var fieldName = event.target.name; + if (fieldName === "date_due") { + var date_due = event.data.changes.date_due; + this.trigger_up("change_date_due", {data: date_due}); + } else { + this._super.apply(this, arguments); + } + }, + start: function() { + this._super.apply(this, arguments); + var self = this; + this._makeDateDueRecord().then(function(recordID) { + self.fields.date_due = new basic_fields.FieldDate( + self, + "date_due", + self.model.get(recordID), + { + mode: "edit", + attrs: {placeholder: _t("Select Due date")}, + } + ); + if (self._initialState.st_line.date_due !== "") { + self.fields.date_due.value = self._initialState.st_line.date_due; + } + self.fields.date_due.insertAfter( + self.$(".accounting_view caption .o_buttons") + ); + }); + }, + _makeDateDueRecord: function() { + var field = { + type: "date", + name: "date_due", + }; + return this.model.makeRecord("account.bank.statement.line", [field], { + date_due: {}, + }); + }, + }); +}); diff --git a/account_reconciliation_widget_due_date/tests/__init__.py b/account_reconciliation_widget_due_date/tests/__init__.py new file mode 100644 index 00000000..bd159dc2 --- /dev/null +++ b/account_reconciliation_widget_due_date/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_account_reconciliation_widget_date_due diff --git a/account_reconciliation_widget_due_date/tests/test_account_reconciliation_widget_date_due.py b/account_reconciliation_widget_due_date/tests/test_account_reconciliation_widget_date_due.py new file mode 100644 index 00000000..a247900a --- /dev/null +++ b/account_reconciliation_widget_due_date/tests/test_account_reconciliation_widget_date_due.py @@ -0,0 +1,143 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import date + +from odoo.tests.common import Form, TransactionCase + + +class TestAccountReconciliationWidgetDueDate(TransactionCase): + def setUp(self): + super().setUp() + self.company = self.env.ref("base.main_company") + self.journal = self.env["account.journal"].create( + {"name": "Test journal bank", "type": "bank", "code": "BANK-TEST"} + ) + self.account = self.env["account.account"].create( + { + "name": "Account Receivable", + "code": "AR", + "user_type_id": self.env.ref("account.data_account_type_receivable").id, + "reconcile": True, + } + ) + self.partner_a = self.env["res.partner"].create( + { + "name": "Partner Test A", + "property_account_receivable_id": self.account.id, + } + ) + self.partner_b = self.partner_a.copy({"name": "Partner Test B"}) + self.partner_c = self.partner_a.copy({"name": "Partner Test C"}) + self.statement = self._create_account_bank_statement() + + def _create_account_bank_statement(self): + statement_form = Form(self.env["account.bank.statement"]) + statement_form.journal_id = self.journal + statement_form.date = date(2021, 3, 1) + statement_form.balance_end_real = 600.00 + with statement_form.line_ids.new() as line_form: + line_form.date = "2021-01-01" + line_form.name = "LINE_A" + line_form.partner_id = self.partner_a + line_form.amount = 100.00 + with statement_form.line_ids.new() as line_form: + line_form.date = "2021-02-01" + line_form.date_due = "2021-02-05" + line_form.name = "LINE_B" + line_form.partner_id = self.partner_b + line_form.amount = 200.00 + with statement_form.line_ids.new() as line_form: + line_form.date = "2021-03-01" + line_form.name = "LINE_C" + line_form.partner_id = self.partner_c + line_form.amount = 300.00 + return statement_form.save() + + def test_account_reconciliation_widget(self): + self.assertEqual(self.statement.state, "open") + self.assertEqual(len(self.statement.line_ids), 3) + reconciliation_widget = self.env["account.reconciliation.widget"] + account_move_model = self.env["account.move"] + # line_a + line_a = self.statement.line_ids.filtered( + lambda x: x.partner_id == self.partner_a + ) + self.assertFalse(line_a.date_due, False) + new_aml_dicts = [ + { + "account_id": self.partner_a.property_account_receivable_id.id, + "name": line_a.name, + "credit": line_a.amount, + } + ] + res = reconciliation_widget.process_bank_statement_line( + line_a.id, + [{"partner_id": line_a.partner_id.id, "new_aml_dicts": new_aml_dicts}], + ) + self.assertEqual(len(res["moves"]), 1) + move = account_move_model.browse(res["moves"][0]) + self.assertEqual(move.line_ids, line_a.journal_entry_ids) + move_line_credit = move.line_ids.filtered(lambda x: x.debit > 0) + self.assertFalse(move_line_credit.date_maturity) + self.assertEqual(move_line_credit.partner_id, self.partner_a) + # line_b + line_b = self.statement.line_ids.filtered( + lambda x: x.partner_id == self.partner_b + ) + self.assertEqual(line_b.date_due, date(2021, 2, 5)) + new_aml_dicts = [ + { + "account_id": self.partner_b.property_account_receivable_id.id, + "name": line_b.name, + "credit": line_b.amount, + } + ] + res = reconciliation_widget.process_bank_statement_line( + [line_b.id], + [ + { + "partner_id": line_b.partner_id.id, + "new_aml_dicts": new_aml_dicts, + "date_due": line_b.date_due, + } + ], + ) + self.assertEqual(len(res["moves"]), 1) + move = account_move_model.browse(res["moves"][0]) + self.assertEqual(move.line_ids, line_b.journal_entry_ids) + move_line_credit = move.line_ids.filtered(lambda x: x.debit > 0) + self.assertEqual(move_line_credit.date_maturity, date(2021, 2, 5)) + self.assertEqual(move_line_credit.partner_id, self.partner_b) + # line_c + line_c = self.statement.line_ids.filtered( + lambda x: x.partner_id == self.partner_c + ) + self.assertFalse(line_c.date_due) + new_aml_dicts = [ + { + "account_id": self.partner_c.property_account_receivable_id.id, + "name": line_c.name, + "credit": line_c.amount, + } + ] + res = reconciliation_widget.process_bank_statement_line( + [line_c.id], + [ + { + "partner_id": line_c.partner_id.id, + "new_aml_dicts": new_aml_dicts, + "date_due": "2021-02-05", + } + ], + ) + self.assertEqual(line_c.date_due, date(2021, 2, 5)) + self.assertEqual(len(res["moves"]), 1) + move = account_move_model.browse(res["moves"][0]) + self.assertEqual(move.line_ids, line_c.journal_entry_ids) + move_line_credit = move.line_ids.filtered(lambda x: x.debit > 0) + self.assertEqual(move_line_credit.date_maturity, date(2021, 2, 5)) + self.assertEqual(move_line_credit.partner_id, self.partner_c) + # Confirm statement + self.statement.check_confirm_bank() + self.assertEqual(self.statement.state, "confirm") diff --git a/account_reconciliation_widget_due_date/views/account_bank_statement_line_view.xml b/account_reconciliation_widget_due_date/views/account_bank_statement_line_view.xml new file mode 100644 index 00000000..f20c40f8 --- /dev/null +++ b/account_reconciliation_widget_due_date/views/account_bank_statement_line_view.xml @@ -0,0 +1,15 @@ + + + + + + account.bank.statement.form + account.bank.statement + + + + + + + + diff --git a/account_reconciliation_widget_due_date/views/assets.xml b/account_reconciliation_widget_due_date/views/assets.xml new file mode 100644 index 00000000..bb3ea064 --- /dev/null +++ b/account_reconciliation_widget_due_date/views/assets.xml @@ -0,0 +1,19 @@ + + +