From 2f198e85766e432dcf8d628a96ca3d1d55a9bfee Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 26 Jul 2011 12:09:59 +0530
Subject: [PATCH 1/3] [FIX] account_cancel: re-open invoice assigned to
 useability/no one

lp bug: https://launchpad.net/bugs/807543 fixed

bzr revid: ara@tinyerp.com-20110726063959-lh8o2qjc697xe1jo
---
 addons/account_cancel/account_cancel_view.xml | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 9e8b532e931..786afb9e9f0 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -12,5 +12,30 @@
                 </field>
             </field>
         </record>
+
+        <record id="invoice_form_inherit" model="ir.ui.view">
+            <field name="name">invoice.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
+                    <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="invoice_supplier_form_inherit" model="ir.ui.view">
+            <field name="name">invoice.supplier.form.inherit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
+                    <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>

From 58120374ed729badb5d5d906503b26ef43ea0d34 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 26 Jul 2011 14:40:51 +0530
Subject: [PATCH 2/3] [FIX] account_cancel: re-open invoice assigned to
 useability/no one

bzr revid: ara@tinyerp.com-20110726091051-22djjebh06h2jxmc
---
 addons/account/account_invoice_view.xml       | 4 ++--
 addons/account_cancel/account_cancel_view.xml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 0f12001193d..8d284756708 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -212,7 +212,7 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="6" colspan="4">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
@@ -306,7 +306,7 @@
                                 <field name="state"/>
                                 <field name="residual"/>
                                 <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
 
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 786afb9e9f0..3e751f83a53 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -22,6 +22,9 @@
                 <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
                     <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
                 </xpath>
+                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                </xpath>
             </field>
         </record>
 
@@ -34,6 +37,9 @@
                 <xpath expr="/form/notebook/page/group/group/button[@name='%(account.action_account_state_open)d']" position="replace">
                     <button name='%(account.action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="account.group_account_invoice"/>
                 </xpath>
+                <xpath expr="/form/notebook/page/group/group/button[@name='invoice_cancel']" position="replace">
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/>
+                </xpath>
             </field>
         </record>
 

From d15fa3f93375ca15596931132903f3f3dcaf0c11 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Tue, 26 Jul 2011 17:00:57 +0530
Subject: [PATCH 3/3] [FIX] account_cancel: re-open invoice assigned to
 useability/no one

bzr revid: ara@tinyerp.com-20110726113057-ji4plcxe13hondqw
---
 addons/account_cancel/account_cancel_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 3e751f83a53..51ac8f7b74d 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -13,8 +13,8 @@
             </field>
         </record>
 
-        <record id="invoice_form_inherit" model="ir.ui.view">
-            <field name="name">invoice.form.inherit</field>
+        <record id="invoice_form_cancel_inherit" model="ir.ui.view">
+            <field name="name">invoice.form.cancel.inherit</field>
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
@@ -28,8 +28,8 @@
             </field>
         </record>
 
-        <record id="invoice_supplier_form_inherit" model="ir.ui.view">
-            <field name="name">invoice.supplier.form.inherit</field>
+        <record id="invoice_supplier_cancel_form_inherit" model="ir.ui.view">
+            <field name="name">invoice.supplier.cancel.form.inherit</field>
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>