From 7e47dbd1cdecfc2cec961fcc630ee7c21531efdf Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 11:52:02 +0530
Subject: [PATCH] [IMP]:account:Improved SQL reports(Invoice Analysis and
 Entries Analysis).

bzr revid: apa@tinyerp.com-20100527062202-p926f650dwok9h9f
---
 .../report/account_entries_report_view.xml    | 71 +++++++++----------
 .../report/account_invoice_report_view.xml    | 35 ++++-----
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index f07de0cdf8d..b31d3bbfd0a 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 string="Invoices Statistics">
+            <tree string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
@@ -37,7 +37,7 @@
          <field name="model">account.entries.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Entries" type="bar">
+             <graph string="Entries Analysis" type="bar">
                  <field name="partner_id"/>
                  <field name="amount"/>
              </graph>
@@ -48,15 +48,15 @@
         <field name="model">account.entries.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Entries">
+            <search string="Entries Analysis">
             	<group colspan="10" col="12">
-	            	<filter icon="terp-account" string="This Year"
+	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
 	            			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-		                    help="Entries of the year"/>
-	                <filter icon="terp-account" string="This Month"
+		                    help="Entries of last 365 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 30 Days"
 	                		name="This Month"
 	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Entries of this month"/>
+	                		help="Entries of last 30 days"/>
 	                <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
@@ -66,56 +66,55 @@
                     <filter string="Draft"
                     		icon="terp-account"
                     		domain="[('state','=','draft')]"
-                    		help = "Draft tasks"/>
+                    		help = "Draft entries"/>
+                    <filter string="Posted"
+                            icon="terp-account"
+                            domain="[('state','=','posted')]"
+                            help = "Posted entries"/>
                     <separator orientation="vertical"/>
-                    		<field name="journal_id" widget="selection"/>
-                    		<field name="account_id"/>
-                    		<field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="partner_id" />
+                    <field name="product_id" />
+                    <field name="partner_id" />
+                    <field name="account_id"/>
+                    <field name="analytic_account_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 					</group>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
-                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
-                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                <group expand="1" string="Group By...">
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <filter string="Journal" name="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
+                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    <filter string="Account" name="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic Account" name="Analytic Account" icon="terp-account" context="{'group_by':'analytic_account_id'}"/>
                     <filter string="State of Move Line" icon="terp-account" context="{'group_by':'state_2'}"/>
                     <filter string="Period" icon="terp-account" context="{'group_by':'period_id'}"/>
                     <filter string="Period of Move Line" icon="terp-account" context="{'group_by':'period_id2'}"/>
-                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
-                    <separator orientation="vertical"/>
+                    <newline/>
                     <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                  </group>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
-                	<filter string="Posted"
-                   			icon="terp-account"
-                   			domain="[('state','=','posted')]"
-                   			help = "Posted tasks"/>
-                		<field name="state_2"/>
-                	<separator orientation="vertical"/>
-                		<field name="period_id" widget="selection"/>
-                		<field name="period_id2" widget="selection"/>
-                		<field name="type"/>
-                    <field name="product_id" />
-                    <field name="analytic_account_id"/>
+                 <newline/>
+                 <group expand="0" string="Extended options..." groups="base.group_extended">
+                	<field name="state_2"/>
+                	<field name="period_id" widget="selection"/>
+                	<field name="period_id2" widget="selection"/>
+                	<field name="type"/>
+                    <field name="journal_id" widget="selection"/>
                     <newline/>
-                	<separator orientation="vertical"/>
                     <field name="date_created"/>
-                		<field name="date"/>
+                	<field name="date"/>
                     <field name="date_maturity"/>
-                </group>
-
+                 </group>
             </search>
         </field>
     </record>
     <record id="action_account_entries_report_all" model="ir.actions.act_window">
-        <field name="name">Entries</field>
+        <field name="name">Entries Analysis</field>
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 7acd0c332b1..b8b0b09490b 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Invoices Statistics">
+            <tree string="Invoices Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -42,7 +42,7 @@
          <field name="model">account.invoice.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Invoices Statistics" type="bar">
+             <graph string="Invoices Analysis" type="bar">
                  <field name="product_id"/>
                  <field name="price_total"/>
              </graph>
@@ -54,7 +54,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Invoices">
+            <search string="Invoices Analysis">
               <group col="10" colspan="12">
 	            	<filter icon="gtk-media-rewind" string="Last 365 Days"
 		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
@@ -72,27 +72,28 @@
                     <filter string="Draft"
                     		icon="terp-account"
                     		domain="[('state','=','draft')]"
-                    		help = "Draft tasks"/>
+                    		help = "Draft Invoices"/>
                    	<filter string="Pro-forma"
                    			icon="terp-account"
                    			domain="[('state','=','proforma'),('state','=','proforma2')]"
-                   			help = "Pro-forma tasks"/>
+                   			help = "Pro-forma Invoices"/>
                    	<filter string="Current"
 	                		icon="terp-account"
 	                		domain="[('state', '=' ,'open')]"
-	                		help = "In progress tasks"/>
+	                		help = "open Invoices"/>
 	                <filter string="Done"
                             icon="terp-account"
                             domain="[('state','=','paid')]"
-                            help = "Done tasks"/>
+                            help = "Done Invoices"/>
   					<separator orientation="vertical"/>
   					<field name="partner_id"/>
                     <field name="user_id" widget="selection">
                     <filter icon="terp-account"
-                    		string="Invoices Non Users"
-                    		help="Invoices Non Users"
-                    		domain="[('user_id','=',False)]"/>
+                    		string="My Invoices"
+                    		help="My Invoices"
+                    		domain="[('user_id','=',uid)]"/>
                     </field>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By...">
@@ -119,6 +120,9 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
+
+                    <field name="date" string="Date Invoiced"/>
+                    <separator orientation="vertical"/>
                     <field name="type"/>
                     <field name="currency_id" widget="selection"/>
                     <field name="partner_bank" widget="selection"/>
@@ -127,27 +131,26 @@
                     <field name="address_contact_id"/>
                     <field name="account_id"/>
                     <newline/>
+                    <field name="date_due"/>
+                    <separator orientation="vertical"/>
                     <field name="payment_term" widget="selection"/>
                     <field name="journal_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="state"/>
                     <separator orientation="vertical"/>
                 	<field name="address_invoice_id"/>
                 	<field name="product_id"/>
-                	<newline/>
-					<field name="date" string="Date Invoiced"/>
-					<field name="date_due"/>
                 </group>
             </search>
         </field>
     </record>
 
     <record id="action_account_invoice_report_all" model="ir.actions.act_window">
-        <field name="name">Invoices</field>
+        <field name="name">Invoices Analysis</field>
         <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_User':1,'group_by_no_leaf':1,'group_by':[],'search_default_user_id':uid}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
     </record>