From 92cdfc41a45bdd3c64f18c77f42e4781249d90f7 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Thu, 27 May 2010 16:47:21 +0530
Subject: [PATCH] [IMP]:account,sale:Improved SQL reports(Sales Analysis and
 account's reports).

bzr revid: apa@tinyerp.com-20100527111721-co6kddx5umt805hd
---
 .../report/account_account_report_view.xml    | 13 ++--
 .../account_analytic_entries_report_view.xml  | 33 +++++----
 .../report/account_analytic_report_view.xml   | 71 +++++++------------
 .../report/account_entries_report_view.xml    |  2 +-
 addons/sale/report/sale_report_view.xml       |  2 +-
 5 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
index efdb4567935..137fa0c69ae 100644
--- a/addons/account/report/account_account_report_view.xml
+++ b/addons/account/report/account_account_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">account.account.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Account Report">
+            <tree string="Accounts Analysis">
                 <field name="name" invisible="1" string="Account"/>
                 <field name="code" invisible="1"/>
                 <field name="type" invisible="1"/>
@@ -29,7 +29,7 @@
          <field name="model">account.account.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Accounts" type="bar">
+             <graph string="Accounts Analysis" type="bar">
              	<field name="name"/>
                 <field name="credit" operator="+"/>
                 <field name="debit" operator="+"/>
@@ -43,7 +43,7 @@
         <field name="model">account.account.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Accounts">
+            <search string="Accounts Analysis">
                <group>
                <filter icon="terp-account"
 	                    	string="At Date"
@@ -54,7 +54,6 @@
 	            <separator orientation="vertical"/>
             	<field name="name" string="Account"/>
             	<field name="code"/>
-                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -69,9 +68,11 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="parent_account_id" />
+                    <separator orientation="vertical"/>
                     <field name="type" />
                     <field name="user_type" widget="selection"/>
-                    <field name="parent_account_id" />
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
 
             </search>
@@ -79,7 +80,7 @@
     </record>
 
     <record id="action_account_account_report" model="ir.actions.act_window">
-        <field name="name">Accounts</field>
+        <field name="name">Accounts Analysis</field>
         <field name="res_model">account.account.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 84dca63f440..610cf14a1d8 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">analytic.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Analytic Entries Statistics">
+            <tree string="Analytic Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
@@ -33,26 +33,25 @@
         <field name="model">analytic.entries.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Analytic Entries">
+            <search string="Analytic Entries Analysis">
               <group col="10" colspan="12">
-	            	<filter icon="terp-account" string="Last 365 DAys"
+	            	<filter icon="gtk-media-rewind" string="Last 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 the year"/>
-	                <filter icon="terp-account" string="Last 30 Days"
+		                    help="Analytic Entries of last 365 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 30 Days"
 	                		name="month"
 	                		domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                		help="Analytic Entries of this month"/>
+	                		help="Analytic Entries of last 30 days"/>
 	                <filter icon="gtk-media-rewind"
 	                        string="    7 Days    "
 	                        separator="1"
 	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Analytic Entries during last 7 days"/>
 	                <separator orientation="vertical"/>
-	                <field name="name"/>
+	                <field name="product_id" />
 	                <field name="user_id" widget="selection">
-	                <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Case"/>
+	                <filter icon="terp-account" domain="[('user_id','=',uid)]" help="My Entries"/>
 	                </field>
-	                <field name="currency_id"/>
 	            </group>
                 <newline/>
                 <group expand="1" string="Group By...">
@@ -73,15 +72,15 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended options..." groups="base.group_extended">
-					<field name="account_id" />
+					<field name="currency_id" widget="selection"/>
 					<field name="general_account_id" widget="selection"/>
-					<field name="journal_id" widget="selection"/>
-					<separator orientation="vertical"/>
-					<field name="product_id" />
 					<field name="product_uom_id" widget="selection"/>
-                    <field name="company_id" widget="selection" groups="base.multi_company"/>
+					<field name="journal_id" widget="selection"/>
+					<field name="company_id" widget="selection" groups="base.multi_company"/>
+					<separator orientation="vertical"/>
+                    <field name="name"/>
+					<field name="account_id"/>
         		</group>
-
             </search>
         </field>
     </record>
@@ -90,7 +89,7 @@
          <field name="model">analytic.entries.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Analytic Entries" type="bar">
+             <graph string="Analytic Entries Analysis" type="bar">
              	<field name="user_id"/>
                 <field name="amount" operator="+"/>
                 <field name="unit_amount" operator="+"/>
@@ -99,7 +98,7 @@
          </field>
     </record>
     <record id="action_analytic_entries_report" model="ir.actions.act_window">
-        <field name="name">Analytic Entries</field>
+        <field name="name">Analytic Entries Analysis</field>
         <field name="res_model">analytic.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index a013f8a7369..2864386f582 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">analytic.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Analytic Accounts Statistics">
+            <tree string="Analytic Accounts Analysis">
             	<field name="parent_id" invisible="1" string="Analytic Account"/>
             	<field name="product_id" invisible="1"/>
                 <field name="name" invisible="1"/>
@@ -19,9 +19,9 @@
                 <field name="nbr" sum ="# of Lines"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="type" invisible="1"/>
-                <field name="debit"/>
-                <field name="credit"/>
-                <field name="balance"/>
+                <field name="debit" sum ="Debit"/>
+                <field name="credit" sum ="Credit"/>
+                <field name="balance" sum ="Balance"/>
                 <field name="state" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
@@ -34,20 +34,20 @@
         <field name="model">analytic.report</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Analytic Accounts">
+            <search string="Analytic Accounts Analysis">
             	<group>
-	                <filter icon="terp-account"
-	                    	string="This Year"
-	                    	domain="[('year','=',time.strftime('%%Y'))]"/>
-	                <filter icon="terp-account"
-	                    	string="This Month"
-	                    	name="This Month"
-	                    	domain="[('month','=',time.strftime('%%m'))]"/>
-	                <filter icon="gtk-media-rewind"
-	                        string="    7 Days    "
-	                        separator="1"
-	                        domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                        help="Entries during last 7 days"/>
+	                <filter icon="gtk-media-rewind" string="Last 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 Accounts of last 365 days"/>
+                    <filter icon="gtk-media-rewind" string="Last 30 Days"
+                            name="month"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Accounts of last 30 days"/>
+                    <filter icon="gtk-media-rewind"
+                            string="    7 Days    "
+                            separator="1"
+                            domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                            help="Analytic Accounts during last 7 days"/>
 	                <separator orientation="vertical"/>
 	                <filter icon="terp-account"
                     		string="Draft"
@@ -60,13 +60,14 @@
                     		domain="[('state','=','pending')]"/>
                     <separator orientation="vertical"/>
 	                <field name="name"/>
+	                <field name="product_id" />
+	                <field name="partner_id"/>
 	                <field name="user_id" widget="selection">
 	                    <filter icon="terp-account"
 	                        	string="My Accounts"
 	                        	help="My Account"
 	                        	domain="[('user_id','=',uid)]"/>
 	                </field>
-	                <field name="partner_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -85,34 +86,16 @@
                     <filter string="Month" icon="terp-account" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
-
                 <newline/>
                 <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
-                    <filter icon="terp-account"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-                    <filter icon="terp-account"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-                    <filter icon="terp-account"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
-                    <filter icon="terp-account"
-                    		string="Close"
-                    		domain="[('state','=','close')]"/>
-                    <filter icon="terp-account"
-                    		string="Template"
-                    		domain="[('state','=','template')]"/>
-                    <separator orientation="vertical"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <field name="parent_id"/>
-                    <field name="journal_id" widget="selection"/>
-                    <newline/>
-                    <field name="product_id" />
-                    <field name="type"/>
-                    <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <separator orientation="vertical"/>
+                    <field name="state"/>
+                    <field name="parent_id"/>
+                    <field name="journal_id" widget="selection"/>
+                    <field name="type"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 </search>
         </field>
@@ -122,7 +105,7 @@
          <field name="model">analytic.report</field>
          <field name="type">graph</field>
          <field name="arch" type="xml">
-             <graph string="Analytic Accounts" type="bar">
+             <graph string="Analytic Accounts Analysis" type="bar">
              	<field name="user_id"/>
                 <field name="credit" operator="+"/>
                 <field name="debit" operator="+"/>
@@ -132,7 +115,7 @@
          </field>
     </record>
     <record id="action_analytic_report_all" model="ir.actions.act_window">
-        <field name="name">Analytic Accounts</field>
+        <field name="name">Analytic Accounts Analysis</field>
         <field name="res_model">analytic.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index b31d3bbfd0a..f61348c290c 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -76,7 +76,6 @@
                     <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...">
@@ -105,6 +104,7 @@
                 	<field name="period_id2" widget="selection"/>
                 	<field name="type"/>
                     <field name="journal_id" widget="selection"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="date_created"/>
                 	<field name="date"/>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 2542257ddac..91cada4c858 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -79,7 +79,6 @@
                             help="My Sales"
                             domain="[('user_id','=',uid)]"/>
 	                </field>
-	                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
 				<newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -107,6 +106,7 @@
                     <field name="shop_id" widget="selection"/>
                     <field name="state"/>
                     <field name="categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
             </search>
         </field>