From ceacb8c0ceb15160ff94963641e7ec70eba7169f Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Tue, 10 Aug 2010 17:50:47 +0530
Subject: [PATCH] [IMP] account : account entries report, remove the comment
 for account_tax_code report which is used in account tax code object.

bzr revid: vra@tinyerp.com-20100810122047-5wj80ep4awrv991o
---
 addons/account/report/__init__.py             |  2 +-
 .../account/report/account_entries_report.py  |  2 ++
 .../report/account_entries_report_view.xml    | 29 +++++++++----------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 88b9a274710..7c908570c2a 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -30,7 +30,7 @@ import invoice
 import overdue
 import account_aged_partner_balance
 import tax_report
-#import account_tax_code
+import account_tax_code
 import account_balance_landscape
 import compare_account_balance
 import account_invoice_report
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 05fe51a0da6..a40705fd83f 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -36,6 +36,7 @@ class account_entries_report(osv.osv):
         'debit':fields.float('Debit', readonly=True),
         'credit':fields.float('Credit', readonly=True),
         'balance': fields.float('Balance', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'date': fields.date('Date', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
@@ -82,6 +83,7 @@ class account_entries_report(osv.osv):
                 l.state as state_2,
                 to_char(am.date, 'YYYY') as year,
                 to_char(am.date, 'MM') as month,
+                to_char(am.date, 'YYYY-MM-DD') as day,
                 l.partner_id as partner_id,
                 l.product_id as product_id,
                 am.company_id as company_id,
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index dc21c20fd2d..6db0d9ce8d7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -11,24 +11,26 @@
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
                 <field name="ref" invisible="1"/>
+                <field name="nbr" sum="# of Entries "/>
+                <field name="quantity" sum="# of Products Qty "/>
+                <field name="debit"/>
+                <field name="credit"/>
+                <field name="balance"/>
                 <field name="state" invisible="1"/>
                 <field name="state_2" invisible="1"/>
-                <field name="year"  invisible="1"/>
-                <field name="day"  invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
+                <field name="year"  invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="analytic_account_id" invisible="1"/>
+                <field name="fiscalyear_id" invisible="1"/>
                 <field name="period_id" invisible="1"/>
-                <field name="period_id2" invisible="1"/>
+                <field name="user_type" invisible="1"/>
                 <field name="type" invisible="1"/>
-                <field name="nbr" sum="# of Entries "/>
-                <field name="nbl" sum="# of Lines "/>
-                <field name="amount" sum="# of Amount "/>
-                <field name="quantity" sum="# of Products Qty "/>
            </tree>
         </field>
     </record>
@@ -38,8 +40,10 @@
          <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Entries Analysis" type="bar">
-                 <field name="partner_id"/>
-                 <field name="amount"/>
+                <field name="partner_id"/>
+                <field name="debit" operator="+"/>
+                <field name="credit" operator="+"/>
+                <field name="balance" operator="+"/>
              </graph>
          </field>
     </record>
@@ -79,21 +83,15 @@
                     <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic" name="analytic_account" icon="terp-folder-orange" context="{'group_by':'analytic_account_id'}"/>
-                    <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <filter string="Journal" name="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Year" icon="terp-go-month" context="{'group_by':'fiscalyear_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Analytic Account" name="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
                     <filter string="State of Move Line" icon="terp-stock_effects-object-colorize" context="{'group_by':'state_2'}"/>
-                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
-                    <filter string="Period of Move Line" icon="terp-go-month" context="{'group_by':'period_id2'}"/>
                     <newline/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -112,7 +110,6 @@
                     <separator orientation="vertical"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
-                    <field name="date"/>
                     <field name="date_created"/>
                 	<field name="date"/>
                     <field name="date_maturity"/>