[FIX] temp model test name & fix OCA remarks

Author: mourad-ehm

base_exception/models/base_exception.py

@@ -45,15 +45,15 @@ class ExceptionRule(models.Model):
     active = fields.Boolean('Active')
     next_state = fields.Char(
         'Next state',
-        help="If we detect exception we set de state of object (ex purchase) "
+        help="If we detect exception we set the state of object (ex purchase) "
              "to the next_state (ex 'to approve'). If there are more than one "
              "exception detected and all have a value for next_state, we use"
              "the exception having the smallest sequence value")
     code = fields.Text(
         'Python Code',
         help="Python code executed to check if the exception apply or "
              "not. The code must apply block = True to apply the "
-             "exception.",
+             "exception. Use failed = True to block the exception",
         default="""
 # Python code. Use failed = True to block the base.exception.
 # You can use the following variables :
@@ -63,7 +63,7 @@ class ExceptionRule(models.Model):
 #       base.exception line (ex rule_group = sale for sale order)
 #  - object: same as order or line, browse_record of the base.exception or
 #    base.exception line
-#  - pool: ORM model pool (i.e. self.pool)
+#  - env: Odoo Environment (i.e. self.env)
 #  - time: Python time module
 #  - cr: database cursor
 #  - uid: current user id
@@ -79,10 +79,10 @@ def _check_next_state_value(self):
                 select_vals = self.env[
                     rule.model].fields_get()[
                         'state']['selection']
-                if rule.next_state\
-                        not in [s[0] for s in select_vals]:
+                select_vals_code = [s[0] for s in select_vals]
+                if rule.next_state not in select_vals_code:
                     raise ValidationError(
-                        _('The value "%s" you chose for the "next state" '
+                        _('The value "%s" you choose for the "next state" '
                           'field state of "%s" is wrong.'
                           ' Value must be in this list %s')
                         % (rule.next_state,
@@ -121,14 +121,14 @@ def _compute_main_error(self):
     @api.multi
     def _popup_exceptions(self):
         action = self._get_popup_action()
-        action = action.read()[0]
-        action.update({
+        action_data = action.read()[0]
+        action_data.update({
             'context': {
                 'active_id': self.ids[0],
                 'active_ids': self.ids
             }
         })
-        return action
+        return action_data
 
     @api.model
     def _get_popup_action(self):
@@ -189,12 +189,12 @@ def detect_exceptions(self):
     def _exception_rule_eval_context(self, obj_name, rec):
         user = self.env['res.users'].browse(self._uid)
         return {obj_name: rec,
-                'self': self.pool.get(rec._name),
+                'self': self.env[rec._name],
                 'object': rec,
                 'obj': rec,
-                'pool': self.pool,
-                'cr': self._cr,
-                'uid': self._uid,
+                'env': self.env,
+                'cr': self.env.cr,
+                'uid': self.env.user.id,
                 'user': user,
                 'time': time,
                 # copy context to prevent side-effects of eval
@@ -225,10 +225,8 @@ def _detect_exceptions(self, model_exceptions,
             if self._rule_eval(rule, self.rule_group, self):
                 exception_ids.append(rule.id)
                 if rule.next_state:
-                    if not next_state_rule:
-                        next_state_rule = rule
-                    elif next_state_rule and\
-                            rule.sequence < next_state_rule.sequence:
+                    if not next_state_rule or\
+                       rule.sequence < next_state_rule.sequence:
                         next_state_rule = rule
         if sub_exceptions:
             for obj_line in self._get_lines():

base_exception/security/ir.model.access.csv

@@ -4,4 +4,4 @@ access_exception_rule_manager,base.exception,model_exception_rule,base_exception
 access_base_exception,base.exception,model_base_exception,base.group_user,1,0,0,0
 access_base_exception_manager,base.exception,model_base_exception,base_exception.group_exception_rule_manager,1,1,1,1
 access_base_exception_test_purchase,access_base_exception_test_purchase,model_base_exception_test_purchase,base.group_system,1,1,1,1
-access_base_exception_test_model_line,access_base_exception_test_model_line,model_base_exception_test_model_line,base.group_system,1,1,1,1
+access_base_exception_test_purchasel_line,access_base_exception_test_purchasel_line,model_base_exception_test_purchase_line,base.group_system,1,1,1,1

base_exception/tests/test_tmp_model.py

@@ -22,7 +22,7 @@ class PurchaseTest(models.Model):
         string="Status", readonly=True, default='draft')
     active = fields.Boolean(default=True)
     partner_id = fields.Many2one('res.partner', string='Partner')
-    line_ids = fields.One2many('base.exception.test.model.line', 'lead_id')
+    line_ids = fields.One2many('base.exception.test.purchase.line', 'lead_id')
     amount_total = fields.Float(compute='_compute_amount_total', store=True)
 
     @api.depends('line_ids')
@@ -62,10 +62,11 @@ def test_base_get_lines(self):
 
 
 class LineTest(models.Model):
-    _name = "base.exception.test.model.line"
+    _name = "base.exception.test.purchase.line"
     _description = "Base Ecxeption Test Model Line"
 
     name = fields.Char()
-    lead_id = fields.Many2one('base.exception.test.model', ondelete='cascade')
+    lead_id = fields.Many2one('base.exception.test.purchase',
+                              ondelete='cascade')
     qty = fields.Float()
     amount = fields.Float()

base_exception/wizard/base_exception_confirm.py

@@ -3,7 +3,8 @@
 # Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
 
 
 class ExceptionRuleConfirm(models.AbstractModel):
@@ -22,7 +23,9 @@ def default_get(self, field_list):
         current_model = self._context.get('active_model')
         model_except_obj = self.env[current_model]
         active_ids = self._context.get('active_ids')
-        assert len(active_ids) == 1, "Only 1 ID accepted, got %r" % active_ids
+        if len(active_ids) > 1:
+            raise ValidationError(
+                _('Only 1 ID accepted, got %r.') % active_ids)
         active_id = active_ids[0]
         related_model_except = model_except_obj.browse(active_id)
         exception_ids = [e.id for e in related_model_except.exception_ids]