From 8aa0e2f0c3fb406496ed2c26657d1176ca065781 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Fri, 24 Sep 2010 13:12:07 +0530
Subject: [PATCH] [IMP] account: improved analytic entries analysis report.

bzr revid: vra@tinyerp.com-20100924074207-gciyn6eqq6oxpycl
---
 .../report/account_analytic_entries_report.py | 13 ++++----
 .../account_analytic_entries_report_view.xml  | 30 +++++++------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index 2a1b4ad993b..ec813b8ecd8 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -35,6 +35,7 @@ class analytic_entries_report(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'user_id' : fields.many2one('res.users', 'User',readonly=True),
         'name': fields.char('Description', size=64, readonly=True),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
@@ -44,8 +45,7 @@ class analytic_entries_report(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uom_id': fields.many2one('product.uom', 'Product UOM', required=True),
         'amount': fields.float('Amount', readonly=True),
-        'unit_amount': fields.float('Unit Amount', readonly=True),
-        'amount_currency': fields.float('Amount Currency', readonly=True),
+        'unit_amount': fields.float('Quantity', readonly=True),
         'nbr': fields.integer('#Entries', readonly=True),
     }
     def init(self, cr):
@@ -61,6 +61,7 @@ class analytic_entries_report(osv.osv):
                      to_char(a.create_date, 'YYYY-MM-DD') as day,
                      a.user_id as user_id,
                      a.name as name,
+                     analytic.partner_id as partner_id,
                      a.company_id as company_id,
                      a.currency_id as currency_id,
                      a.account_id as account_id,
@@ -70,12 +71,12 @@ class analytic_entries_report(osv.osv):
                      a.product_id as product_id,
                      a.product_uom_id as product_uom_id,
                      sum(a.amount) as amount,
-                     sum(a.unit_amount) as unit_amount,
-                     sum(a.amount_currency) as amount_currency
+                     sum(a.unit_amount) as unit_amount
                  from
-                     account_analytic_line a
+                     account_analytic_line a, account_analytic_account analytic
+                 where analytic.id = a.account_id
                  group by
-                     a.create_date, a.user_id,a.name,company_id,a.currency_id,
+                     a.create_date, a.user_id,a.name,analytic.partner_id,a.company_id,a.currency_id,
                      a.account_id,a.general_account_id,a.journal_id,
                      a.move_id,a.product_id,a.product_uom_id
             )
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index b837186f23c..8902f83abbd 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -13,6 +13,7 @@
                 <field name="month" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="name" invisible="1"/>
+                <field name="partner_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="currency_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
@@ -21,9 +22,8 @@
                 <field name="product_id" invisible="1"/>
                 <field name="product_uom_id" invisible="1"/>
                 <field name="nbr" sum="Entries"/>
+                <field name="unit_amount" sum="Quantity"/>
                 <field name="amount" sum="Amount"/>
-                <field name="unit_amount" sum="Unit Amount"/>
-                <field name="amount_currency" sum="Amount Currency"/>
             </tree>
         </field>
     </record>
@@ -48,20 +48,22 @@
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Entries during last 7 days"/>
                     <separator orientation="vertical"/>
+                    <field name="date" />
+                    <field name="account_id" />
                     <field name="product_id" />
-                    <field name="user_id" widget="selection">
+                    <field name="user_id">
                     <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
                     </field>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
+                    <filter string="Partner"  icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Account"  icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="Account"  icon="terp-folder-green" context="{'group_by':'account_id'}"/>
                     <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
-                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Journal" icon="terp-folder-green" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
@@ -70,17 +72,6 @@
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
-                <newline/>
-                <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="currency_id" widget="selection"/>
-                    <field name="general_account_id" widget="selection"/>
-                    <field name="product_uom_id" widget="selection"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="name"/>
-                    <field name="account_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </group>
             </search>
         </field>
     </record>
@@ -91,9 +82,8 @@
          <field name="arch" type="xml">
              <graph string="Analytic Entries Analysis" type="bar">
                 <field name="user_id"/>
-                <field name="amount" operator="+"/>
                 <field name="unit_amount" operator="+"/>
-                <field name="amount_currency" operator="+"/>
+                <field name="amount" operator="+"/>
              </graph>
          </field>
     </record>
@@ -102,7 +92,7 @@
         <field name="res_model">analytic.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="context">{'search_default_month':1,'group_by_no_leaf':1,'group_by':['account_id','month']}</field>
         <field name="search_view_id" ref="view_analytic_entries_report_search"/>
         <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
     </record>