From 96e07165c3d46bfc7e19ee47eed0b8587c28c685 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 20 Sep 2010 18:01:12 +0200
Subject: [PATCH] [IMP] account: usability changes in analysis view

bzr revid: qdp-launchpad@tinyerp.com-20100920160112-ij614heo78furavq
---
 .../report/account_entries_report_view.xml    | 16 +++---
 .../report/account_invoice_report_view.xml    | 51 ++++++++-----------
 2 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 2d87f6a4f06..f6282046e00 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -55,13 +55,13 @@
             <search string="Entries Analysis">
                 <group colspan="10" col="12">
                     <filter icon="terp-go-year" string="This F.Year"
-                            name="year"
+                            name="thisyear"
                             domain="[('period_id','in','current_year')]"                        
-                            help="Entries with period in current year"/>
+                            help="Journal Entries with period in current year"/>
                     <filter icon="terp-go-month" string="This Period"
                             name="period"
                             domain="[('period_id','in','current_period')]"
-                            help="Entries with period in current period"/>
+                            help="Journal Entries with period in current period"/>
                     <separator orientation="vertical"/>
                     <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"/>
@@ -70,7 +70,7 @@
                     <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
                     <separator orientation="vertical"/>
                     <field name="account_id"/>
-                    <field name="journal_id"/>
+                    <field name="journal_id" widget="selection"/>
                     <field name="period_id"/>
                 </group>
                 <newline/>
@@ -83,7 +83,7 @@
                     <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="Acc.Type" icon="terp-folder-blue" context="{'group_by':'user_type'}"/>
+                    <filter string="Acc.Type" icon="terp-folder-blue" context="{'group_by':'user_type'}" name="usertype"/>
                     <filter string="Int.Type" icon="terp-folder-yellow" context="{'group_by':'type'}"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -94,13 +94,11 @@
                  </group>
                  <newline/>
                  <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="journal_id" widget="selection"/>
-                    <field name="period_id"/>
                     <field name="fiscalyear_id"/>
                     <separator orientation="vertical"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
-                    <separator orientation="vertical"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="date_created"/>
@@ -115,7 +113,7 @@
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_journal':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[], 'search_default_year':1, 'search_default_period':1}</field>
+        <field name="context">{'group_by':[],'search_default_usertype':1,  'search_default_thisyear':1, 'group_by_no_leaf':1,}</field>
         <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>
     <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 6333f2d61ee..98dd3f64fb7 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -25,6 +25,7 @@
                 <field name="address_contact_id" invisible="1"/>
                 <field name="address_invoice_id" invisible="1"/>
                 <field name="partner_bank_id" invisible="1"/>
+                <field name="date_due" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
@@ -57,19 +58,6 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group col="10" colspan="12">
-                    <filter icon="terp-go-year" string="  365 Days  "
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                            help="Validated invoices of last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
-                            name="month"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                            help="Validated invoices of last 30 days"/>
-                    <filter icon="terp-go-week"
-                            string="    7 Days    "
-                            separator="1"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                            help="Validated invoices during last 7 days"/>
-                    <separator orientation="vertical"/>
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -78,19 +66,25 @@
                            icon="terp-gtk-media-pause"
                            domain="['|', ('state','=','proforma'),('state','=','proforma2')]"
                            help = "Pro-forma Invoices"/>
+                    <filter string="Invoiced"
+                           name="current"
+                           icon="terp-check"
+                           domain="[('state','not in', ('draft','cancel'))]"
+                           help = "Open and Paid Invoices"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-sale" string="Customer"
+                            name="customer"
                             domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
                             help="Customer Invoices And Refunds"/>
                     <filter icon="terp-purchase"
-                            string="Supplier"
+                            string="Vendor"
                             separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                            help="Supplier Invoices And Refunds"/>
+                            help="Vendor Invoices And Refunds"/>
                    <separator orientation="vertical"/>
                    <filter icon="terp-dolar" string="Invoice"
                             domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
-                            help="Customer And Supplier Invoices"/>
+                            help="Customer And Vendor Invoices"/>
                    <filter icon="terp-dolar_ok!"
                             string="Refund"
                             separator="1"
@@ -99,6 +93,7 @@
                    <separator orientation="vertical"/>
                    <field name="partner_id"/>
                    <field name="user_id" />
+                   <field name="date" string="Date Invoiced"/>
                    <field name="categ_id" />
                 </group>
                 <newline/>
@@ -113,30 +108,26 @@
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
-                    <separator orientation="vertical"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                    <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
+                    <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
+                    <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
                     <field name="product_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="journal_id" widget="selection"/>
                     <field name="account_id"/>
                     <separator orientation="vertical"/>
-                    <field name="type"/>
-                    <field name="journal_id" widget="selection"/>
-                    <separator orientation="vertical"/>
-                    <field name="state"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <newline/>
-                    <field name="date" string="Date Invoiced"/>
                     <field name="date_due"/>
+                    <separator orientation="vertical" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
             </search>
         </field>
@@ -147,7 +138,7 @@
         <field name="res_model">account.invoice.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1,'search_default_partner':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':1}</field>
+        <field name="context">{'search_default_current':1,'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
         <field name="help">A tool search lets you know statistics on invoices that match your needs.</field>