From 6da812ca4e2294fbe4f4648dd1eba9f44328921d Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 10 Sep 2010 17:58:53 +0200
Subject: [PATCH] [IMP] account: accounting entries analysis improvements
 (usability)

bzr revid: qdp-launchpad@tinyerp.com-20100910155853-h4y312ldela1ldxb
---
 .../account/report/account_entries_report.py  | 13 ++++----
 .../report/account_entries_report_view.xml    | 32 +++++++++----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 1047453289c..acf15ce53c1 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -47,10 +47,8 @@ class account_entries_report(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True),
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', readonly=True,
-                                  help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Posted\' state.'),
-        'state_2': fields.selection([('draft','Draft'), ('valid','Valid')], 'State of Move Line', readonly=True,
-                                  help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
+        'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True),
+        'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True),
         'reconcile_id': fields.many2one('account.move.reconcile', readonly=True),
         'partner_id': fields.many2one('res.partner','Partner', readonly=True),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
@@ -59,9 +57,10 @@ class account_entries_report(osv.osv):
         'type': fields.selection([
             ('receivable', 'Receivable'),
             ('payable', 'Payable'),
+            ('cash', 'Cash'),
             ('view', 'View'),
             ('consolidation', 'Consolidation'),
-            ('other', 'Others'),
+            ('other', 'Regular'),
             ('closed', 'Closed'),
         ], 'Internal Type', readonly=True, help="This type is used to differentiate types with "\
             "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
@@ -116,8 +115,8 @@ class account_entries_report(osv.osv):
                 l.date_maturity as date_maturity,
                 l.date_created as date_created,
                 am.ref as ref,
-                am.state as state,
-                l.state as state_2,
+                am.state as move_state,
+                l.state as move_line_state,
                 l.reconcile_id as reconcile_id,
                 to_char(am.date, 'YYYY') as year,
                 to_char(am.date, 'MM') as month,
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 1cefe896b67..046eb8852d7 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('posted')" string="Entries Analysis">
+            <tree colors="blue:move_state in ('draft');black:move_state in ('posted')" string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
@@ -16,7 +16,7 @@
                 <field name="debit"/>
                 <field name="credit"/>
                 <field name="balance"/>
-                <field name="state" invisible="1"/>
+                <field name="move_state" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="year"  invisible="1"/>
@@ -52,20 +52,20 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group colspan="10" col="12">
-                    <filter icon="terp-go-year" string="This Year"
+                    <filter icon="terp-go-year" string="This F.Year"
                             name="year"
                             domain="[('period_id','in','current_year')]"                        
-                            help="Entries created in current year"/>
-                    <filter icon="terp-go-month" string="This Month"
+                            help="Entries with period in current year"/>
+                    <filter icon="terp-go-month" string="This Period"
                             name="period"
                             domain="[('period_id','in','current_period')]"
-                            help="Entries created in current period"/>
+                            help="Entries with period in current period"/>
                     <separator orientation="vertical"/>
-                    <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft entries"/>
-                    <filter string="Posted" icon="terp-camera_test" domain="[('state','=','posted')]" help = "Posted entries"/>
+                    <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
+                    <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
                     <separator orientation="vertical"/>
-                    <filter string="Reconciled" icon="terp-document-new" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
-                    <filter string="Unreconciled" icon="terp-stock_symbol-selection" domain="[('reconcile_id','=',False)]" help = "Unreconciled entries"/>
+                    <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False)]" help = "Unreconciled entries"/>
+                    <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
                     <separator orientation="vertical"/>
                     <field name="account_id"/>
                     <field name="journal_id"/>
@@ -73,16 +73,15 @@
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Account" name="group_account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" name="group_account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
                     <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_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'}"/>
@@ -99,7 +98,6 @@
                     <field name="period_id"/>
                     <field name="fiscalyear_id"/>
                     <separator orientation="vertical"/>
-                    <separator orientation="vertical"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <separator orientation="vertical"/>