From d4d8a2eae31e7a6a45029b84603e055300e3be36 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Mon, 25 May 2015 22:41:54 +0200
Subject: [PATCH] [IMP] account: usability improvements

---
 addons/account/views/account_invoice_view.xml      |  2 --
 addons/account_voucher/account_voucher_view.xml    | 10 ++++------
 .../voucher_sales_purchase_view.xml                |  4 ++--
 addons/sale/sale_view.xml                          | 14 --------------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 955ecdd76a3..9bacb760f79 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -133,8 +133,6 @@
                     <field name="user_id"/>
                     <field name="date_due"/>
                     <field name="origin"/>
-                    <field name="amount_untaxed" groups="base.group_multi_currency" string="Untaxed Amount (in currency)"/>
-                    <field name="amount_untaxed_signed" sum="Untaxed Amount"/>
                     <field name="amount_total_signed" sum="Total Amount"/>
                     <field name="residual_signed" sum="Residual Amount"/>
                     <field name="currency_id" invisible="1"/>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 46909cb573f..a157308ced3 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -9,8 +9,7 @@
                     <field name="date"/>
                     <field name="number"/>
                     <field name="reference"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id" groups="account.group_account_user"/>
+                    <field name="partner_id" string="Customer"/>
                     <field name="voucher_type" invisible="context.get('visible', True)"/>
                     <field name="amount" sum="Total Amount"/>
                     <field name="currency_id" invisible="1"/>
@@ -18,16 +17,15 @@
                 </tree>
             </field>
         </record>
-        <record model="ir.ui.view" id="view_voucher_tree_nocreate">
-            <field name="name">account.voucher.tree_nocreate</field>
+        <record model="ir.ui.view" id="view_voucher_tree_purchase">
+            <field name="name">account.voucher.tree.supplier</field>
             <field name="model">account.voucher</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';gray:state == 'cancel';red:audit" string="Voucher Entries" create="0" edit="0">
                     <field name="date"/>
                     <field name="number"/>
                     <field name="reference"/>
-                    <field name="partner_id"/>
-                    <field name="journal_id" groups="account.group_account_user"/>
+                    <field name="partner_id" string="Supplier"/>
                     <field name="voucher_type" invisible="context.get('visible', True)"/>
                     <field name="amount" sum="Total Amount"/>
                     <field name="currency_id" invisible="1"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 67a83567cdf..047973079af 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -126,7 +126,7 @@
             <field name="view_mode">tree,kanban</field>
             <field name="domain">[('journal_id.type','=','sale'), ('voucher_type','=','sale')]</field>
             <field name="context">{'default_voucher_type': 'sale', 'voucher_type': 'sale'}</field>
-            <field name="view_id" eval="False"/>
+            <field name="view_id" eval="view_voucher_tree"/>
             <field name="search_view_id" ref="view_voucher_filter_sale"/>
             <field name="target">current</field>
             <field name="help" type="html">
@@ -245,7 +245,7 @@
             <field name="view_mode">tree,kanban</field>
             <field name="domain">[('journal_id.type','=','purchase'), ('voucher_type','=','purchase')]</field>
             <field name="context">{'default_voucher_type': 'purchase', 'voucher_type': 'purchase'}</field>
-            <field name="view_id" eval="False"/>
+            <field name="view_id" eval="view_voucher_tree_purchase"/>
             <field name="search_view_id" eval="view_voucher_filter_vendor"/>
             <field name="target">current</field>
             <field name="help" type="html">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0ae294dc9e0..a43c22f7cad 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -629,20 +629,6 @@
             </field>
         </record>
 
-       <!-- Update account invoice list view!-->
-        <record model="ir.ui.view" id="account_invoice_tree">
-            <field name="name">Account Invoice</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_tree"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="team_id" string="Sales Team" groups="base.group_multi_salesteams"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <!-- Update account invoice search view!-->
         <record id="account_invoice_groupby_inherit" model="ir.ui.view">
             <field name="name">account.invoice.groupby</field>