From e69395f0bc6adef3f500952d19def91b0f412dfc Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 2 May 2012 14:47:01 +0530
Subject: [PATCH] [IMP] Sale: Improve the domain on Open Invoice button as
 order_policy postpaid is removed now

bzr revid: psi@tinyerp.com-20120502091701-v4sb5hmnez24k9rn
---
 addons/sale/sale_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 483095aa976..38fa150f66d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -109,10 +109,9 @@
                         <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>
                         <button name="order_confirm" states="draft,sent" string="Confirm Order" icon="gtk-apply"/>
                         <button name="action_view_invoice" string="Open Invoice" icon="gtk-go-forward" type="object" 
-                                attrs="{'invisible': ['|','|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking'),
-                                '&amp;','&amp;',('order_policy','=','postpaid'),('state', '=','progress'),('shipped','=',False)]}"/>
+                        attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
                         <button name="action_view_delivery" string="Open Delivery Order" icon="gtk-go-forward" type="object" 
-                                attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                        attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                         <button name="cancel" states="draft,sent" string="Cancel Order" icon="gtk-cancel"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                         <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>