From c6a93d6e732177c12ddf175b63ac70f5da091e4a Mon Sep 17 00:00:00 2001 From: chaule97 Date: Thu, 28 Nov 2024 15:29:00 +0700 Subject: [PATCH] [MIG] sale_automatic_workflow: Migration to 18.0 --- sale_automatic_workflow/README.rst | 1 + sale_automatic_workflow/__manifest__.py | 2 +- .../data/automatic_workflow_data.xml | 6 +-- .../models/automatic_workflow_job.py | 2 +- sale_automatic_workflow/models/sale_order.py | 4 +- .../readme/CONTRIBUTORS.md | 1 + .../static/description/index.html | 1 + sale_automatic_workflow/tests/common.py | 40 ++++++++----------- .../views/sale_workflow_process_views.xml | 8 ++-- 9 files changed, 29 insertions(+), 36 deletions(-) diff --git a/sale_automatic_workflow/README.rst b/sale_automatic_workflow/README.rst index 061d82fc8c56..ab6a95583f69 100644 --- a/sale_automatic_workflow/README.rst +++ b/sale_automatic_workflow/README.rst @@ -92,6 +92,7 @@ Contributors - Phuc Tran Thanh - Sander Lienaerts - Tri Doan +- Chau Le Other credits ------------- diff --git a/sale_automatic_workflow/__manifest__.py b/sale_automatic_workflow/__manifest__.py index b3415a95a687..030420635b0a 100644 --- a/sale_automatic_workflow/__manifest__.py +++ b/sale_automatic_workflow/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Sale Automatic Workflow", - "version": "17.0.1.1.0", + "version": "18.0.0.1.0", "category": "Sales Management", "license": "AGPL-3", "author": "Akretion, " diff --git a/sale_automatic_workflow/data/automatic_workflow_data.xml b/sale_automatic_workflow/data/automatic_workflow_data.xml index ece7f7aff480..7b14424ac2d6 100644 --- a/sale_automatic_workflow/data/automatic_workflow_data.xml +++ b/sale_automatic_workflow/data/automatic_workflow_data.xml @@ -86,14 +86,12 @@ Automatic Workflow Job - + code model.run() - + 1 minutes - -1 - diff --git a/sale_automatic_workflow/models/automatic_workflow_job.py b/sale_automatic_workflow/models/automatic_workflow_job.py index 500f061a978c..1352bf171559 100644 --- a/sale_automatic_workflow/models/automatic_workflow_job.py +++ b/sale_automatic_workflow/models/automatic_workflow_job.py @@ -164,7 +164,7 @@ def _register_payment_invoice(self, invoice): ("account_type", "in", ("asset_receivable", "liability_payable")), ("reconciled", "=", False), ] - payment_lines = payment.line_ids.filtered_domain(domain) + payment_lines = payment.move_id.line_ids.filtered_domain(domain) lines = invoice.line_ids for account in payment_lines.account_id: (payment_lines + lines).filtered_domain( diff --git a/sale_automatic_workflow/models/sale_order.py b/sale_automatic_workflow/models/sale_order.py index b6e7693fd0d8..e0088bdfbcdd 100644 --- a/sale_automatic_workflow/models/sale_order.py +++ b/sale_automatic_workflow/models/sale_order.py @@ -3,7 +3,7 @@ # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import _, api, fields, models +from odoo import api, fields, models from odoo.tools import float_compare @@ -55,7 +55,7 @@ def _prepare_invoice(self): def _onchange_workflow_process_id(self): if self.workflow_process_id.warning: warning = { - "title": _("Workflow Warning"), + "title": self.env._("Workflow Warning"), "message": self.workflow_process_id.warning, } return {"warning": warning} diff --git a/sale_automatic_workflow/readme/CONTRIBUTORS.md b/sale_automatic_workflow/readme/CONTRIBUTORS.md index ed3c76a65df3..a5898d316c0e 100644 --- a/sale_automatic_workflow/readme/CONTRIBUTORS.md +++ b/sale_automatic_workflow/readme/CONTRIBUTORS.md @@ -11,3 +11,4 @@ - Phuc Tran Thanh \<\> - Sander Lienaerts \<\> - Tri Doan \<\> +- Chau Le \<\> diff --git a/sale_automatic_workflow/static/description/index.html b/sale_automatic_workflow/static/description/index.html index c41e3f26000a..8f90c456b2a0 100644 --- a/sale_automatic_workflow/static/description/index.html +++ b/sale_automatic_workflow/static/description/index.html @@ -439,6 +439,7 @@

Contributors

  • Phuc Tran Thanh <phuc@trobz.com>
  • Sander Lienaerts <sander.lienaerts@codeforward.nl>
  • Tri Doan <tridm@trobz.com>
    • +
  • Chau Le <chaulb@trobz.com>
    • diff --git a/sale_automatic_workflow/tests/common.py b/sale_automatic_workflow/tests/common.py index 1b4e360d38e8..58bcc8892cd2 100644 --- a/sale_automatic_workflow/tests/common.py +++ b/sale_automatic_workflow/tests/common.py @@ -86,36 +86,28 @@ def setUpClass(cls, chart_template_ref=None): _job_force_sync=True, ) ) - cls.company_fr = cls.setup_company_data( - { - "name": "French company", - "currency_id": cls.env.ref("base.EUR").id, - "country_id": cls.env.ref("base.fr").id, - } + cls.company_fr = cls.setup_other_company( + name="French company", + currency_id=cls.env.ref("base.EUR").id, + country_id=cls.env.ref("base.fr").id, )["company"] - cls.company_ch = cls.setup_company_data( - { - "name": "Swiss company", - "currency_id": cls.env.ref("base.CHF").id, - "country_id": cls.env.ref("base.ch").id, - } + cls.company_ch = cls.setup_other_company( + name="Swiss company", + currency_id=cls.env.ref("base.CHF").id, + country_id=cls.env.ref("base.ch").id, )["company"] - cls.company_be = cls.setup_company_data( - { - "name": "Belgian company", - "currency_id": cls.env.ref("base.EUR").id, - "country_id": cls.env.ref("base.be").id, - } + cls.company_be = cls.setup_other_company( + name="Belgian company", + currency_id=cls.env.ref("base.EUR").id, + country_id=cls.env.ref("base.be").id, )["company"] - cls.company_fr_daughter = cls.setup_company_data( - { - "name": "French company daughter", - "currency_id": cls.env.ref("base.EUR").id, - "country_id": cls.env.ref("base.fr").id, - } + cls.company_fr_daughter = cls.setup_other_company( + name="French company daughter", + currency_id=cls.env.ref("base.EUR").id, + country_id=cls.env.ref("base.fr").id, )["company"] cls.env.user.company_ids |= cls.company_fr diff --git a/sale_automatic_workflow/views/sale_workflow_process_views.xml b/sale_automatic_workflow/views/sale_workflow_process_views.xml index 413c33e2e6b1..dae0371d38fd 100644 --- a/sale_automatic_workflow/views/sale_workflow_process_views.xml +++ b/sale_automatic_workflow/views/sale_workflow_process_views.xml @@ -290,23 +290,23 @@ - sale_automic_workflow.sale_workflow_process.view_tree + sale_automic_workflow.sale_workflow_process.view_list sale.workflow.process - + - + Automatic Workflow sale.workflow.process - tree,form + list,form