Default to company_id when company_ids is empty.

Remove migration script that is not necessary anymore.
OCA · Oct 12, 2017 · 1dbec4e · 1dbec4e
1 parent 92b0bea
commit 1dbec4e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/mis_builder/__manifest__.py b/mis_builder/__manifest__.py
@@ -19,11 +19,6 @@
         'date_range',  # OCA/server-tools
         'web_widget_color',  # OCA/web
     ],
-    'external_dependencies': {
-        'python': [
-            'openupgradelib',
-        ],
-    },
     'data': [
         'wizard/mis_builder_dashboard.xml',
         'views/mis_report.xml',

diff --git a/mis_builder/migrations/10.0.3.1.0/post-migration.py b/mis_builder/migrations/10.0.3.1.0/post-migration.py
diff --git a/mis_builder/models/mis_report_instance.py b/mis_builder/models/mis_report_instance.py
@@ -406,11 +406,9 @@ def _default_company_id(self):
     @api.onchange('company_id', 'multi_company')
     def _onchange_company(self):
         if self.company_id and self.multi_company:
-            self.company_ids = self.env['res.company'].search(
-                ['|', ('id', '=', self.company_id.id),
-                 ('parent_id', 'child_of', self.company_id.id)
-                 ]
-            )
+            self.company_ids = self.env['res.company'].search([
+                ('id', 'child_of', self.company_id.id),
+            ])
         else:
             self.company_ids = self.company_id
 
@@ -621,7 +619,8 @@ def _compute_matrix(self):
         is guaranteed to be the id of the mis.report.instance.period.
         """
         self.ensure_one()
-        aep = self.report_id._prepare_aep(self.company_ids, self.currency_id)
+        aep = self.report_id._prepare_aep(
+            self.company_ids or self.company_id, self.currency_id)
         kpi_matrix = self.report_id.prepare_kpi_matrix()
         for period in self.period_ids:
             description = None
@@ -652,7 +651,7 @@ def drilldown(self, arg):
         account_id = arg.get('account_id')
         if period_id and expr and AEP.has_account_var(expr):
             period = self.env['mis.report.instance.period'].browse(period_id)
-            aep = AEP(self.company_ids, self.currency_id)
+            aep = AEP(self.company_ids or self.company_id, self.currency_id)
             aep.parse_expr(expr)
             aep.done_parsing()
             domain = aep.get_aml_domain_for_expr(