[BPRT] edi: Backport from 14.0

Author: etobella

edi_oca/__manifest__.py

@@ -9,7 +9,7 @@
     Define backends, exchange types, exchange records,
     basic automation and views for handling EDI exchanges.
     """,
-    "version": "14.0.1.20.1",
+    "version": "12.0.1.20.1",
     "website": "https://github.com/OCA/edi",
     "development_status": "Beta",
     "license": "LGPL-3",
@@ -22,7 +22,7 @@
         "base_sparse_field",
         "queue_job",
     ],
-    "external_dependencies": {"python": ["pyyaml"]},
+    "external_dependencies": {"python": ["yaml"]},
     "data": [
         "wizards/edi_exchange_record_create_wiz.xml",
         "data/cron.xml",

edi_oca/models/edi_backend.py

@@ -174,7 +174,7 @@ def _create_record_prepare_values(self, type_code, values):
         exchange_type = self.env["edi.exchange.type"].search(
             self._get_exchange_type_domain(type_code), limit=1
         )
-        assert exchange_type, f"Exchange type not found: {type_code}"
+        assert exchange_type, "Exchange type not found: {}".format(type_code)
         res["type_id"] = exchange_type.id
         res["backend_id"] = self.id
         return res
@@ -473,9 +473,6 @@ def exchange_process(self, exchange_record):
                 {
                     "edi_exchange_state": state,
                     "exchange_error": error,
-                    # FIXME: this should come from _compute_exchanged_on
-                    # but somehow it's failing in send tests (in record tests it works).
-                    "exchanged_on": fields.Datetime.now(),
                 }
             )
             if state == "input_processed_error":
@@ -621,8 +618,7 @@ def _find_existing_exchange_records(
         return self.env["edi.exchange.record"].search(domain, count=count_only)
 
     def action_view_exchanges(self):
-        xmlid = "edi_oca.act_open_edi_exchange_record_view"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env.ref("edi_oca.act_open_edi_exchange_record_view")
         action["context"] = {
             "search_default_backend_id": self.id,
             "default_backend_id": self.id,
@@ -631,8 +627,7 @@ def action_view_exchanges(self):
         return action
 
     def action_view_exchange_types(self):
-        xmlid = "edi_oca.act_open_edi_exchange_type_view"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env.ref("edi_oca.act_open_edi_exchange_type_view")
         action["context"] = {
             "search_default_backend_id": self.id,
             "default_backend_id": self.id,

edi_oca/models/edi_backend_type.py

@@ -31,4 +31,6 @@ def _onchange_code(self):
     def _inverse_code(self):
         for rec in self:
             # Make sure it's always normalized
-            rec.code = normalize_string(rec.code)
+            code = normalize_string(rec.code)
+            if code != rec.code:
+                rec.code = code

edi_oca/models/edi_exchange_consumer_mixin.py

@@ -36,6 +36,7 @@ class EDIExchangeConsumerMixin(models.AbstractModel):
     exchange_record_ids = fields.One2many(
         "edi.exchange.record",
         inverse_name="res_id",
+        prefetch=False,
         domain=lambda r: [("model", "=", r._name)],
     )
     exchange_record_count = fields.Integer(compute="_compute_exchange_record_count")
@@ -80,7 +81,7 @@ def _edi_get_exchange_type_config(self):
                 if not eval_ctx.get("result", False):
                     continue
 
-            result[rule.id] = self._edi_get_exchange_type_rule_conf(rule)
+            result[str(rule.id)] = self._edi_get_exchange_type_rule_conf(rule)
         return result
 
     @api.model
@@ -181,8 +182,7 @@ def edi_create_exchange_record(self, exchange_type_id):
         return self._edi_get_create_record_wiz_action(exchange_type_id)
 
     def _edi_get_create_record_wiz_action(self, exchange_type_id):
-        xmlid = "edi_oca.edi_exchange_record_create_act_window"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env.ref("edi_oca.edi_exchange_record_create_act_window")
         action["context"] = {
             "default_res_id": self.id,
             "default_model": self._name,
@@ -241,8 +241,7 @@ def _compute_exchange_record_count(self):
 
     def action_view_edi_records(self):
         self.ensure_one()
-        xmlid = "edi_oca.act_open_edi_exchange_record_view"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env.ref("edi_oca.act_open_edi_exchange_record_view")
         action["domain"] = [("model", "=", self._name), ("res_id", "=", self.id)]
         # Purge default search filters from ctx to avoid hiding records
         ctx = action.get("context", {})

edi_oca/models/edi_exchange_record.py

@@ -8,6 +8,7 @@
 from collections import defaultdict
 
 from odoo import _, api, exceptions, fields, models
+from odoo import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -36,13 +37,11 @@ class EDIExchangeRecord(models.Model):
     direction = fields.Selection(related="type_id.direction")
     backend_id = fields.Many2one(comodel_name="edi.backend", required=True)
     model = fields.Char(index=True, required=False, readonly=True)
-    res_id = fields.Many2oneReference(
-        string="Record",
+    res_id = fields.Integer(
+        string="Record ID",
         index=True,
         required=False,
         readonly=True,
-        model_field="model",
-        copy=False,
     )
     related_record_exists = fields.Boolean(compute="_compute_related_record_exists")
     related_name = fields.Char(compute="_compute_related_name", compute_sudo=True)
@@ -53,8 +52,6 @@ class EDIExchangeRecord(models.Model):
     exchanged_on = fields.Datetime(
         string="Exchanged on",
         help="Sent or received on this date.",
-        compute="_compute_exchanged_on",
-        store=True,
         readonly=False,
     )
     edi_exchange_state = fields.Selection(
@@ -125,15 +122,15 @@ def _compute_related_name(self):
             related_record = rec.record
             rec.related_name = related_record.display_name if related_record else ""
 
-    @api.depends("model", "type_id")
+    @api.depends("model", "type_id", "res_id")
     def _compute_exchange_filename(self):
         for rec in self:
             if not rec.type_id:
                 continue
             if not rec.exchange_filename:
                 rec.exchange_filename = rec.type_id._make_exchange_filename(rec)
 
-    @api.depends("edi_exchange_state")
+    @api.constrains("edi_exchange_state")
     def _compute_exchanged_on(self):
         for rec in self:
             if rec.edi_exchange_state in ("input_received", "output_sent"):
@@ -355,8 +352,7 @@ def action_open_related_exchanges(self):
         self.ensure_one()
         if not self.related_exchange_ids:
             return {}
-        xmlid = "edi_oca.act_open_edi_exchange_record_view"
-        action = self.env["ir.actions.act_window"]._for_xml_id(xmlid)
+        action = self.env.ref("edi_oca.act_open_edi_exchange_record_view")
         action["domain"] = [("id", "in", self.related_exchange_ids.ids)]
         return action
 
@@ -372,7 +368,7 @@ def notify_action_complete(self, action, message=None):
             self._notify_related_record(message)
 
         # Trigger generic action complete event on exchange record
-        event_name = f"{action}_complete"
+        event_name = "{}_complete".format(action)
         self._trigger_edi_event(event_name)
         if self.related_record_exists:
             # Trigger specific event on related record
@@ -453,8 +449,8 @@ def _search(
             count=False,
             access_rights_uid=access_rights_uid,
         )
-        if self.env.is_system():
-            # restrictions do not apply to group "Settings"
+        if self._uid == SUPERUSER_ID:
+            # rules do not apply for the superuser
             return len(ids) if count else ids
 
         # TODO highlight orphaned EDI records in UI:
@@ -531,7 +527,7 @@ def check_access_rule(self, operation):
         """In order to check if we can access a record, we are checking if we can access
         the related document"""
         super(EDIExchangeRecord, self).check_access_rule(operation)
-        if self.env.is_superuser():
+        if self._uid == SUPERUSER_ID:
             return
         default_checker = self.env["edi.exchange.consumer.mixin"].get_edi_access
         by_model_rec_ids = defaultdict(set)
@@ -546,7 +542,7 @@ def check_access_rule(self, operation):
                 )
 
         for model, rec_ids in by_model_rec_ids.items():
-            records = self.env[model].browse(rec_ids).with_user(self._uid)
+            records = self.env[model].browse(rec_ids).sudo(self._uid)
             checker = by_model_checker[model]
             for record in records:
                 check_operation = checker(

edi_oca/tests/common.py

@@ -49,7 +49,7 @@ def _setup_records(cls):
             code="test_csv_output_ack",
             direction="output",
             exchange_file_ext="txt",
-            exchange_filename_pattern="{record.ref}-{type.code}-{dt}",
+            exchange_filename_pattern="{record.name}-{type.code}-{dt}",
         )
         cls.exchange_type_out.ack_type_id = cls.exchange_type_out_ack
         cls.partner = cls.env.ref("base.res_partner_1")

edi_oca/tests/fake_models.py

@@ -11,6 +11,7 @@ class EdiExchangeConsumerTest(models.Model):
     _description = "Model used only for test"
 
     name = fields.Char()
+    ref = fields.Char()
 
     def _get_edi_exchange_record_name(self, exchange_record):
         return self.id

edi_oca/tests/test_backend_process.py

@@ -4,8 +4,6 @@
 
 import base64
 
-from freezegun import freeze_time
-
 from odoo import fields
 from odoo.exceptions import UserError
 from odoo.tools import mute_logger
@@ -36,15 +34,16 @@ def setUp(self):
 
     def test_process_record(self):
         self.record.write({"edi_exchange_state": "input_received"})
-        with freeze_time("2020-10-22 10:00:00"):
-            self.record.action_exchange_process()
+        now = fields.Datetime.now()
+        self.record.action_exchange_process()
         self.assertTrue(FakeInputProcess.check_called_for(self.record))
         self.assertRecordValues(
             self.record, [{"edi_exchange_state": "input_processed"}]
         )
-        self.assertEqual(
-            fields.Datetime.to_string(self.record.exchanged_on), "2020-10-22 10:00:00"
-        )
+        self.record.refresh()
+        self.assertAlmostEqual(
+            (self.record.exchanged_on - now).total_seconds(),
+            0, places=2)
 
     def test_process_record_with_error(self):
         self.record.write({"edi_exchange_state": "input_received"})