[14.0] revert #387

queue_job/job.py

@@ -699,13 +699,7 @@ def db_record(self):
 
     @property
     def func(self):
-        # We can fill only one company into allowed_company_ids.
-        # Because if you have many, you can have unexpected records due to ir.rule.
-        # ir.rule use allowed_company_ids to load every records in many companies.
-        # But most of the time, a job should be executed on a single company.
         recordset = self.recordset.with_context(job_uuid=self.uuid)
-        if self.company_id:
-            recordset = recordset.with_company(self.company_id)
         return getattr(recordset, self.method_name)
 
     @property

test_queue_job/models/test_models.py

@@ -40,7 +40,7 @@ class ModelTestQueueJob(models.Model):
     # to test the context is serialized/deserialized properly
     @api.model
     def _job_prepare_context_before_enqueue_keys(self):
-        return ("tz", "lang")
+        return ("tz", "lang", "allowed_company_ids")
 
     def testing_method(self, *args, **kwargs):
         """Method used for tests

test_queue_job/tests/test_job.py

@@ -190,19 +190,18 @@ def test_company_simple(self):
         company = self.env.ref("base.main_company")
         eta = datetime.now() + timedelta(hours=5)
         test_job = Job(
-            self.method,
+            self.env["test.queue.job"].with_company(company).testing_method,
             args=("o", "k"),
             kwargs={"return_context": 1},
             priority=15,
             eta=eta,
             description="My description",
         )
         test_job.worker_pid = 99999  # normally set on "set_start"
-        test_job.company_id = company.id
         test_job.store()
         job_read = Job.load(self.env, test_job.uuid)
         self.assertEqual(test_job.func.__func__, job_read.func.__func__)
-        result_ctx = test_job.func(*tuple(test_job.args), **test_job.kwargs)
+        result_ctx = job_read.func(*tuple(test_job.args), **test_job.kwargs)
         self.assertEqual(result_ctx.get("allowed_company_ids"), company.ids)
 
     def test_company_complex(self):
@@ -214,19 +213,18 @@ def test_company_complex(self):
         self.assertEqual(self.env.user.company_id, company1)
         eta = datetime.now() + timedelta(hours=5)
         test_job = Job(
-            self.method,
+            self.env["test.queue.job"].with_company(company2).testing_method,
             args=("o", "k"),
             kwargs={"return_context": 1},
             priority=15,
             eta=eta,
             description="My description",
         )
         test_job.worker_pid = 99999  # normally set on "set_start"
-        test_job.company_id = company2.id
         test_job.store()
         job_read = Job.load(self.env, test_job.uuid)
         self.assertEqual(test_job.func.__func__, job_read.func.__func__)
-        result_ctx = test_job.func(*tuple(test_job.args), **test_job.kwargs)
+        result_ctx = job_read.func(*tuple(test_job.args), **test_job.kwargs)
         self.assertEqual(result_ctx.get("allowed_company_ids"), company2.ids)
 
     def test_store(self):