audrius/manufacture
1
0
Fork 0
mirror of https://github.com/OCA/manufacture.git synced 2025-01-28 16:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] quality_control: Several things:

Browse Source 
* not take into account inactivated tests trigger lines
* show action_cancel button in inspections even if it is autogenerated
This commit is contained in:
agaldona
2017-06-07 11:20:45 +02:00
committed by Stefano Consolaro
parent 7580fac5f2
commit 06aef8be20
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
quality_control_oca/models/qc_trigger_line.py
View File

@@ -81,7 +81,8 @@ class QcTriggerProductTemplateLine(models.Model):
for trigger_line in product.product_tmpl_id.qc_triggers.filtered( for trigger_line in product.product_tmpl_id.qc_triggers.filtered(
lambda r: r.trigger == trigger and ( lambda r: r.trigger == trigger and (
not r.partners or not partner or 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) trigger_lines.add(trigger_line)
return trigger_lines return trigger_lines
@@ -100,6 +101,7 @@ class QcTriggerProductLine(models.Model):
for trigger_line in product.qc_triggers.filtered( for trigger_line in product.qc_triggers.filtered(
lambda r: r.trigger == trigger and ( lambda r: r.trigger == trigger and (
not r.partners or not partner or 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) trigger_lines.add(trigger_line)
return trigger_lines return trigger_lines

2
quality_control_oca/views/qc_inspection_view.xml
View File

@@ -30,7 +30,7 @@
string="Approve" /> string="Approve" />
<button name="action_cancel" <button name="action_cancel"
type="object" 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" string="Cancel"
icon="gtk-cancel" /> icon="gtk-cancel" />
<field name="state" <field name="state"