[FIX] base_multi_company: Allow child_of/parent_of operator into sear…

…ch domain on company_id/company_ids

base_multi_company/README.rst

@@ -54,6 +54,7 @@ Contributors
 
 * Dave Lasley <[email protected]>
 * Pedro M. Baeza <[email protected]>
+* Laurent Mignon <[email protected]>
 
 Maintainer
 ----------

base_multi_company/hooks.py

@@ -16,7 +16,7 @@
 def create_company_assignment_view(cr):
  cr.execute("""
  CREATE OR REPLACE VIEW res_company_assignment
- AS SELECT id, name
+ AS SELECT id, name, parent_id
  FROM res_company;
  """)
 

base_multi_company/models/res_company_assignment.py

@@ -19,3 +19,8 @@ class ResCompanyAssignment(models.Model):
  _auto = False
 
  name = fields.Char()
+
+ # This field must never be exposed into the UI. The purpose of this
+ # field is to be able to use the hierarchy operators (
+ # child_of/parent_of) into search domains on company_id / company_ids
+ parent_id = fields.Many2one('res.company')

base_multi_company/tests/test_multi_company_abstract.py

@@ -64,6 +64,7 @@ def setUp(self):
  self.company_1 = Companies._company_default_get()
  self.company_2 = Companies.create({
  'name': 'Test Co 2',
+ 'account_no': '123456'
  })
 
  def add_company(self, company):
@@ -99,8 +100,24 @@ def test_inverse_company_id(self):
 
  def test_search_company_id(self):
  """ It should return correct record by searching company_id. """
+ self.add_company(self.company_2)
+ record = self.env['multi.company.abstract.tester'].search([
+ ('company_id.account_no', '=', self.company_2.account_no),
+ ('id', '=', self.record.id),
+ ])
+ self.assertEqual(record, self.record)
  record = self.env['multi.company.abstract.tester'].search([
  ('company_id', '=', self.company_1.id),
  ('id', '=', self.record.id),
  ])
  self.assertEqual(record, self.record)
+ record = self.env['multi.company.abstract.tester'].search([
+ ('company_ids', 'child_of', self.company_1.id),
+ ('id', '=', self.record.id),
+ ])
+ self.assertEqual(record, self.record)
+ record = self.env['multi.company.abstract.tester'].search([
+ ('company_ids', 'parent_of', self.company_1.id),
+ ('id', '=', self.record.id),
+ ])
+ self.assertEqual(record, self.record)