From 644a42f68358e3093fe178c55c7de4f1ee7e9fca Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 28 Jun 2010 22:12:42 +0200
Subject: [PATCH] [FIX] improved view

bzr revid: fp@tinyerp.com-20100628201242-sws7fmqmtt27nbxr
---
 addons/account/account_move_line.py                 |  2 +-
 addons/account/account_view.xml                     | 13 ++++---------
 addons/account/report/account_entries_report.py     |  3 ---
 .../account/report/account_entries_report_view.xml  |  7 +++++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 0bc9e476601..3a0f889d931 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -508,7 +508,7 @@ class account_move_line(osv.osv):
     _constraints = [
         (_check_no_view, 'You can not create move line on view account.', ['account_id']),
         (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
-        (_check_company_id,'Company must be same for its related account and period.',['company_id'] ),
+        (_check_company_id, 'Company must be same for its related account and period.', ['company_id']),
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9ab85f924e0..77bc6a52b2e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -59,8 +59,9 @@
         <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
 
         <!--
-    Period
-    -->
+            Period
+        -->
+
         <record id="res_role_period" model="res.roles">
             <field eval="&quot;&quot;&quot;Period&quot;&quot;&quot;" name="name"/>
         </record>
@@ -387,16 +388,10 @@
                         <field name="name" select="1"/>
                         <field name="date" select="1"/>
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-<!--                        <field name="currency"/>-->
                         <field name="period_id"/>
-<!--                        <group colspan="2" col="3">-->
-    <!--                        <button name="%(action_view_account_statement_from_invoice)d"-->
-    <!--                            string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}" icon="gtk-open"/>-->
-<!--                            <button name="button_import_invoice" string="Import Invoice" attrs="{'invisible':[('state','=','confirm')]}" type="object" icon="gtk-apply"/>-->
-<!--                        </group>-->
                         <field name="balance_start"/>
                     <field name="balance_end_real"/>
-                    </group>                    
+                    </group>
                     <notebook colspan="4">
                         <page string="Transaction">
                             <field colspan="4" name="line_ids" nolabel="1">
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index f8ae020bae0..2103eb40e76 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -32,7 +32,6 @@ class account_entries_report(osv.osv):
         'date_created': fields.date('Date Created', readonly=True),
         'date_maturity': fields.date('Date Maturity', readonly=True),
         'ref': fields.char('Reference', size=64, readonly=True),
-
         'nbr':fields.integer('# of Items', readonly=True),
         'debit':fields.float('Debit', readonly=True),
         'credit':fields.float('Credit', readonly=True),
@@ -69,7 +68,6 @@ class account_entries_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
     _order = 'date desc'
-
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_entries_report')
         cr.execute("""
@@ -106,5 +104,4 @@ class account_entries_report(osv.osv):
                 left join account_period p on (am.period_id=p.id)
             )
         """)
-
 account_entries_report()
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 20cd4826a3f..d73ebfa32ab 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -68,10 +68,10 @@
                             domain="[('state','=','posted')]"
                             help = "Posted entries"/>
                     <separator orientation="vertical"/>
+                    <field name="journal_id"/>
+                    <field name="period_id"/>
                     <field name="account_id"/>
                     <field name="analytic_account_id"/>
-                    <field name="product_id" />
-                    <field name="partner_id" />
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -98,6 +98,9 @@
                     <field name="date"/>
                     <field name="date_created"/>
                     <field name="date_maturity"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id" />
+                    <field name="partner_id" />
                  </group>
             </search>
         </field>