From ed63cf727db18bc8aaef60c378e9c3c91193a2ca Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 22 Nov 2012 10:38:38 +0100
Subject: [PATCH] [IMP] Improved invoice view.

bzr revid: vta@openerp.com-20121122093838-g3zz61fkkz6omjmy
---
 .../account_voucher_pay_invoice.xml            |  4 ++--
 addons/portal_sale/portal_sale_view.xml        | 18 ++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 83bda5d9511..284632b9b5f 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,9 +8,9 @@
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
                     <button name="invoice_pay_customer" type="object" string="Register Payment"
-                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"/>
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}" groups="base.group_user"/>
                     <button name="invoice_pay_customer" type="object" string="Register Payment"
-                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight"/>
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight" groups="base.group_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 7d3ab5b3632..0a10c80e3ef 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -53,17 +53,19 @@
             <field name="name">Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="domain">[('type','in',['out_invoice','out_refund'])]</field>
+            <field name="context">{'type':['out_invoice','out_refund'], 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
             <field name="help">We haven't sent you any invoice.</field>
         </record>
+
         <record id="portal_action_invoices_tree_spec" model="ir.actions.act_window.view">
             <field name="act_window_id" ref="portal_action_invoices"/>
             <field name="view_id" ref="account.invoice_tree"/>
             <field name="view_mode">tree</field>
             <field name="sequence" eval="0"/>
         </record>
+
         <record id="portal_action_invoices_form_spec" model="ir.actions.act_window.view">
             <field name="act_window_id" ref="portal_action_invoices"/>
             <field name="view_id" ref="account.invoice_form"/>
@@ -71,24 +73,12 @@
             <field name="sequence" eval="1"/>
         </record>
 
-        <record id="action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Customer Refunds</field>
-            <field name="res_model">account.invoice</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('type','=','out_refund')]</field>
-            <field name="context">{'type':'out_refund'}</field>
-            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">We haven't sent you any refund.</field>
-        </record>
-
         <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
             action="action_quotations_portal" sequence="10"/>
         <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders"
             action="action_orders_portal" sequence="20"/>
         <menuitem name="Invoices" id="portal_invoices" parent="portal.portal_orders"
             action="portal_action_invoices" sequence="30"/>
-        <menuitem name="Customer Refunds" id="portal_payments" parent="portal.portal_orders"
-            action="action_invoice_tree2" sequence="40"/>
 
     </data>
 </openerp>