From fd01fd239e07b92cdfbe51e1431f8f8acf6f1868 Mon Sep 17 00:00:00 2001
From: Ian Wilson <ian@laspilitas.com>
Date: Sat, 9 Jul 2011 19:50:16 -0700
Subject: [PATCH] Show Cancel button on purchase when either invoice state or
 shipment state are equal to exception.

Fixes a bug introduced during the upgrade to pyson that caused the cancel button to not show up in certain cases.

review53002
issue2069
---
 purchase.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/purchase.xml b/purchase.xml
index 7a53ee4942..57cdc6e16d 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -108,7 +108,7 @@ this repository contains the full copyright notices and license terms. -->
                                 <field name="state"/>
                                 <group col="6" colspan="2" id="buttons">
                                     <button name="cancel" string="Cancel"
-                                        states="{'invisible': Or(Equal(Eval('state'), 'cancel'), Not(In(Eval('state'), ['draft', 'quotation'])), Equal(Eval('invoice_state'), 'exception'), Equal(Eval('shipment_state'), 'exception')), 'readonly': Not(In(%(group_purchase)d, Eval('groups', [])))}"
+                                        states="{'invisible': Or(Equal(Eval('state'), 'cancel'), And(Not(In(Eval('state'), ['draft', 'quotation'])), Not(Equal(Eval('invoice_state'), 'exception')), Not(Equal(Eval('shipment_state'), 'exception')))), 'readonly': Not(In(%(group_purchase)d, Eval('groups', [])))}"
                                         icon="tryton-cancel"/>
                                     <button name="draft" string="Draft"
                                         states="{'invisible': Not(Equal(Eval('state'), 'quotation')), 'readonly': Not(In(%(group_purchase)d, Eval('groups', [])))}"