[imp] improvement Analysis account

bzr revid: jap@tinyerp.com-20111110104903-v1f11bqlbzapypvg

addons/account/report/account_analytic_entries_report_view.xml

@@ -35,6 +35,19 @@
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
               <group>
+                    <filter icon="terp-go-year" string="  Year  " 
+                            name="year"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="   Month   "
+                            name="month"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="current month"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="last month"/>
+                    <separator orientation="vertical"/>               	
                     <filter icon="terp-go-year" string="  365 Days  "
                             domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
                             help="Analytic Entries of last 365 days"/>
@@ -92,7 +105,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, 'group_by_no_leaf':1, 'search_default_Account':1, 'search_default_Month':1, 'group_by':[]}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1, 'group_by_no_leaf':1, 'search_default_Account':1, 'search_default_Month':1, 'group_by':[]}</field>
         <field name="search_view_id" ref="view_analytic_entries_report_search"/>
         <field name="help">From this view, have an analysis of your different analytic entries following the analytic account you defined matching your business need. Use the tool search to analyse information about analytic entries generated in the system.</field>
     </record>

addons/account/report/account_invoice_report_view.xml

@@ -58,6 +58,19 @@
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
               <group>
+                    <filter icon="terp-go-year" string="  Year  " 
+                            name="year"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="   Month   "
+                            name="month"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="current month"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="last month"/>
+                    <separator orientation="vertical"/>              	
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -91,7 +104,6 @@
                    <separator orientation="vertical"/>
                    <field name="partner_id"/>
                    <field name="user_id" />
-                   <field name="date" string="Invoice Date"/>
                    <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 </group>
                 <newline/>
@@ -101,10 +113,11 @@
                     <field name="journal_id" widget="selection"/>
                     <field name="account_id"/>
                     <field name="account_line_id"/>
-                    <separator orientation="vertical"/>
-                    <field name="date_due"/>
                     <separator orientation="vertical" groups="base.group_multi_company"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="date" string="Invoice Date"/>					
+                    <field name="date_due"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -138,7 +151,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_current':1, 'search_default_category_product':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_category_product':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">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 

addons/account_asset/report/account_asset_report_view.xml

@@ -44,9 +44,10 @@
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <group col="10" colspan="12">
-                    <filter string="This Year" icon="terp-go-year"
+                    <filter string="This Year" icon="terp-go-year" name="year"
                         domain="[('purchase_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Assets purchased in current year"/>
+                    <separator orientation="vertical"/>	
                     <filter string="This Month" icon="terp-go-month" name="this_month"
                         domain="[('purchase_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('purchase_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Assets purchased in current month"/>
@@ -93,7 +94,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_asset_asset_report_search"/>
-        <field name="context">{'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
+        <field name="context">{'search_default_year':1,'search_default_this_month':1,'search_default_asset_category':1, 'search_default_posted':1, 'search_default_purchase_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="help">From this report, you can have an overview on all depreciation. The tool search can also be used to personalise your Assets reports and so, match this analysis to your needs;</field>
     </record>
     

addons/account_voucher/report/account_voucher_sales_receipt_view.xml

@@ -49,6 +49,19 @@
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
               <group>
+                    <filter icon="terp-go-year" string="  Year  " 
+                            name="year"
+                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="year"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-month" string="   Month   "
+                            name="month"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="current month"/>
+                    <filter icon="terp-go-month" string="    Month-1    "
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="last month"/>
+                    <separator orientation="vertical"/>              	
                     <filter string="Draft"
                            icon="terp-document-new"
                            domain="[('state','=','draft')]"
@@ -103,7 +116,7 @@
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+        <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_current':1, 'search_default_partner':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_sale_receipt_report_search"/>
         <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>