[FIX] manual reimplementations of ref/xmlid_to_\*

addons/account/models/account_invoice.py

@@ -327,7 +327,7 @@ class AccountInvoice(models.Model):
     def fields_view_get(self, view_id=None, view_type=False, toolbar=False, submenu=False):
         def get_view_id(xid, name):
             try:
-                return self.env['ir.model.data'].xmlid_to_res_id('account.' + xid, raise_if_not_found=True)
+                return self.env.ref('account.' + xid)
             except ValueError:
                 view = self.env['ir.ui.view'].search([('name', '=', name)], limit=1)
                 if not view:

addons/account/wizard/account_reconcile.py

@@ -74,14 +74,14 @@ class AccountMoveLineReconcileWriteoff(models.TransientModel):
 
     @api.multi
     def trans_rec_addendum(self):
-        model_data_id = self.env['ir.model.data'].search([('model', '=', 'ir.ui.view'), ('name', '=', 'account_move_line_reconcile_writeoff')], limit=1)
+        view = self.env.ref('account.account_move_line_reconcile_writeoff')
         return {
             'name': _('Reconcile Writeoff'),
             'context': self._context,
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'account.move.line.reconcile.writeoff',
-            'views': [(model_data_id.res_id, 'form')],
+            'views': [(view.id, 'form')],
             'type': 'ir.actions.act_window',
             'target': 'new',
         }

addons/account_analytic_plans/wizard/analytic_plan_create_model.py

@@ -11,7 +11,6 @@ class analytic_plan_create_model(osv.osv_memory):
 
     def activate(self, cr, uid, ids, context=None):
         plan_obj = self.pool.get('account.analytic.plan.instance')
-        mod_obj = self.pool.get('ir.model.data')
         anlytic_plan_obj = self.pool.get('account.analytic.plan')
         if context is None:
             context = {}
@@ -24,8 +23,9 @@ class analytic_plan_create_model(osv.osv_memory):
                 raise UserError(_('There is no analytic plan defined.'))
             plan_obj.write(cr, uid, [context['active_id']], {'plan_id':pids[0]}, context=context)
 
-            model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'),('name', '=', 'view_analytic_plan_create_model')], context=context)
-            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+            resource_id = self.pool['ir.model.data'].xmlid_to_res_id(
+                cr, uid, 'account.view_analytic_plan_create_model',
+                context=context, raise_if_not_found=True)
             return {
                 'name': _('Distribution Model Saved'),
                 'view_type': 'form',

addons/anonymization/anonymization.py

@@ -475,7 +475,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         })
 
         # handle the view:
-        view_id = self._id_get(cr, uid, 'ir.ui.view', 'view_ir_model_fields_anonymize_wizard_form', 'anonymization')
+        view_id = self.pool['ir.model.data'].xmlid_to_res_id(
+            cr, uid, 'anonymization.view_ir_model_fields_anonymize_wizard_form',
+            context=context
+        )
 
         return {
                 'res_id': ids[0],
@@ -579,7 +582,11 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             })
 
             # handle the view:
-            view_id = self._id_get(cr, uid, 'ir.ui.view', 'view_ir_model_fields_anonymize_wizard_form', 'anonymization')
+            view_id = self.pool['ir.model.data'].xmlid_to_res_id(
+                cr, uid, 'anonymization.view_ir_model_fields_anonymize_wizard_form',
+                context=context
+            )
+
 
             return {
                     'res_id': ids[0],

addons/l10n_be/wizard/l10n_be_vat_intra.py

@@ -194,7 +194,6 @@ class partner_vat_intra(osv.osv_memory):
         :return: Value for next action.
         :rtype: dict
         """
-        mod_obj = self.pool.get('ir.model.data')
         xml_data = self._get_datas(cursor, user, ids, context=context)
         month_quarter = xml_data['period'][:2]
         year = xml_data['period'][2:]
@@ -235,8 +234,8 @@ class partner_vat_intra(osv.osv_memory):
         context = dict(context or {})
         context['file_save'] = data_file
 
-        model_data_ids = mod_obj.search(cursor, user,[('model','=','ir.ui.view'),('name','=','view_vat_intra_save')], context=context)
-        resource_id = mod_obj.read(cursor, user, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        resource_id = self.pool['ir.model.data'].xmlid_to_res_id(
+            cursor, user, 'l10n_be.view_vat_intra_save', context=context)
 
         return {
             'name': _('Save'),

addons/membership/membership.py

@@ -376,20 +376,17 @@ class Product(osv.osv):
     _inherit = 'product.template'
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        model_obj = self.pool.get('ir.model.data')
+        ModelData = self.pool['ir.model.data']
         if context is None:
             context = {}
 
         if ('product' in context) and (context['product']=='membership_product'):
-            model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name', 'in', ['membership_products_form', 'membership_products_tree'])], context=context)
-            resource_id_form = model_obj.read(cr, user, model_data_ids_form, fields=['res_id', 'name'], context=context)
-            dict_model = {}
-            for i in resource_id_form:
-                dict_model[i['name']] = i['res_id']
             if view_type == 'form':
-                view_id = dict_model['membership_products_form']
+                view_id = ModelData.xmlid_to_res_id(
+                    cr, user, 'membership.membership_products_form', context=context)
             else:
-                view_id = dict_model['membership_products_tree']
+                view_id = ModelData.xmlid_to_res_id(
+                    cr, user, 'membership.membership_products_tree', context=context)
         return super(Product,self).fields_view_get(cr, user, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
     _columns = {