From 834b3fcf2b4e3cf3a59f930c4df143c6eb3995a3 Mon Sep 17 00:00:00 2001
From: "Jni (Open ERP)" <jni@tinyerp.co.in>
Date: Thu, 27 May 2010 18:01:25 +0530
Subject: [PATCH] [IMP]:account:Improved account reports

bzr revid: jni@tinyerp.co.in-20100527123125-g2icffru6d7g9g3w
---
 .../account/report/account_analytic_entries_report_view.xml | 6 +++---
 addons/sale/report/sale_report_view.xml                     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 610cf14a1d8..157a08f8ca5 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="month" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="name" invisible="1"/>
-                <field name="company_id" invisible="1" groups="base.multi_company"/>
+                <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="currency_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="general_account_id" invisible="1"/>
@@ -57,7 +57,7 @@
                 <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
-                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.multi_company"/>
+                    <filter string="Company"  icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Account"  icon="terp-account" context="{'group_by':'account_id'}"/>
                     <filter string="General Account" icon="terp-account" context="{'group_by':'general_account_id'}"/>
@@ -76,10 +76,10 @@
 					<field name="general_account_id" widget="selection"/>
 					<field name="product_uom_id" widget="selection"/>
 					<field name="journal_id" widget="selection"/>
-					<field name="company_id" widget="selection" groups="base.multi_company"/>
 					<separator orientation="vertical"/>
                     <field name="name"/>
 					<field name="account_id"/>
+					<field name="company_id" widget="selection" groups="base.group_multi_company"/>
         		</group>
             </search>
         </field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 91cada4c858..98e74c363b9 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -17,10 +17,10 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
-                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="# of Qty"/>
+                <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" avg="Days to Close"/>