From e08d2b7e67123c1e3f86c4c8634c0896bfd97797 Mon Sep 17 00:00:00 2001
From: agaldona <ainaragaldona@avanzosc.es>
Date: Wed, 7 Jun 2017 11:20:45 +0200
Subject: [PATCH] [FIX] quality_control: Several things:

* not take into account inactivated tests trigger lines
* show action_cancel button in inspections even if it is autogenerated
---
 quality_control_oca/models/qc_trigger_line.py    | 6 ++++--
 quality_control_oca/views/qc_inspection_view.xml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/quality_control_oca/models/qc_trigger_line.py b/quality_control_oca/models/qc_trigger_line.py
index fd485c087..9f5552327 100644
--- a/quality_control_oca/models/qc_trigger_line.py
+++ b/quality_control_oca/models/qc_trigger_line.py
@@ -81,7 +81,8 @@ class QcTriggerProductTemplateLine(models.Model):
         for trigger_line in product.product_tmpl_id.qc_triggers.filtered(
                 lambda r: r.trigger == trigger and (
                 not r.partners or not partner or
-                partner.commercial_partner_id in r.partners)):
+                partner.commercial_partner_id in r.partners) and
+                r.test.active):
             trigger_lines.add(trigger_line)
         return trigger_lines
 
@@ -100,6 +101,7 @@ class QcTriggerProductLine(models.Model):
         for trigger_line in product.qc_triggers.filtered(
                 lambda r: r.trigger == trigger and (
                 not r.partners or not partner or
-                partner.commercial_partner_id in r.partners)):
+                partner.commercial_partner_id in r.partners) and
+                r.test.active):
             trigger_lines.add(trigger_line)
         return trigger_lines
diff --git a/quality_control_oca/views/qc_inspection_view.xml b/quality_control_oca/views/qc_inspection_view.xml
index 6d183f7b3..5e79af9c3 100644
--- a/quality_control_oca/views/qc_inspection_view.xml
+++ b/quality_control_oca/views/qc_inspection_view.xml
@@ -30,7 +30,7 @@
                             string="Approve" />
                     <button name="action_cancel"
                             type="object"
-                            attrs="{'invisible': ['|', ('auto_generated', '=', True), ('state', 'not in', ['waiting', 'ready', 'failed', 'success'])]}"
+                            attrs="{'invisible': [('state', 'not in', ['waiting', 'ready', 'failed', 'success'])]}"
                             string="Cancel"
                             icon="gtk-cancel" />
                     <field name="state"