From 3590fc02e35beca8fbb311c8c6a84243efe6f3a5 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 20 Apr 2010 16:34:24 +0530
Subject: [PATCH] [IMP]:account:improved SQL report.(Invoices)

bzr revid: apa@tinyerp.com-20100420110424-45c5c50r2kxk5iw8
---
 .../account/report/account_invoice_report.py  |   2 +
 .../report/account_invoice_report_view.xml    | 109 ++++++++++--------
 2 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 548e6eb50a6..36fa5a0d132 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -30,6 +30,7 @@ class account_invoice_report(osv.osv):
     _columns = {
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
@@ -71,6 +72,7 @@ class account_invoice_report(osv.osv):
                      s.date_invoice as date,
                      to_char(s.date_invoice, 'YYYY') as year,
                      to_char(s.date_invoice, 'MM') as month,
+                     to_char(s.date_invoice, 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
                      sum(l.quantity * u.factor) as product_qty,
                      s.partner_id as partner_id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index cee7cc0e3f7..d82c7e407ee 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -7,15 +7,16 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Invoices Statistics">
-                <field name="date"/>
-                <field name="user_id"/>
+                <field name="date" invisible="1"/>
+                <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="type" invisible="1"/>
                 <field name="company_id" invisible="1"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-                <field name="product_qty"/>
+                <field name="partner_id" invisible="1"/>
+                <field name="product_id" invisible="1"/>
+                <field name="product_qty" invisible="1"/>
                 <!--field name="delay" avg="Days to Close"/-->
                 <field name="nbr" sum="# of Lines"/>
                 <field name="price_average" avg="Average Price"/>
@@ -49,67 +50,85 @@
         <field name="arch" type="xml">
             <search string="Invoices">
             	<group>
-                <filter icon="terp-account"
-                    string="This Year"
-                    domain="[('year','=',time.strftime('%%Y'))]"
-                    help="Invoices of the year"/>
-                <filter icon="terp-account"
-                    string="This Month"
-                    domain="[('month','=',time.strftime('%%m'))]"
-                    help="Invoices of this month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-account"
-                    string="Draft"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-account"
-                    string="Invoices"
-                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <filter icon="terp-account"
-                    string="Paid"
-                    domain="[('state','=','paid')]"/>
-                <separator orientation="vertical"/>
+	            	<filter icon="terp-account" string="This Year"
+		                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+		                    help="Invoices of the year"/>
+	                <filter icon="terp-account" string="This Month"
+	                		name="month"
+	                		domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+	                		help="Invoices of this month"/>
+	                <filter icon="gtk-media-rewind"
+	                        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="Invoices during last 7 days"/>
+	                <separator orientation="vertical"/>
+                    <filter string="Draft"
+                    		icon="terp-account"
+                    		domain="[('state','=','draft')]"
+                    		help = "Draft tasks"/>
+                   	<filter string="Pro-forma"
+                   			icon="terp-account"
+                   			domain="[('state','=','proforma'),('state','=','proforma2')]"
+                   			help = "Pro-forma tasks"/>
+                   	<filter string="Current"
+	                		icon="terp-account"
+	                		domain="[('state', '=' ,'open')]"
+	                		help = "In progress tasks"/>
+  					<separator orientation="vertical"/>
                 <field name="product_id"/>
                 <field name="user_id" widget="selection">
+
                     <filter icon="terp-account"
-                        string="My Invoices"
-                        name='User'
-                        domain="[('user_id','=',uid)]"/>
+                    		string="My Invoices"
+                    		help = "My Invoices"
+                    		domain="[('user_id','=',uid)]" />
+                    <filter icon="terp-account"
+                    		string="Invoices Non Users"
+                    		help="Invoices Non Users"
+                    		domain="[('user_id','=',False)]"/>
                 </field>
                 <field name="partner_id"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+				<field name="company_id" groups="base.group_multi_company" widget="selection"/>
 				</group>
                 <newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-account"
-                        string="Customer Invoices"
-                        domain="[('type','=','out_invoice')]"
-                        default="1"/>
-                    <filter icon="terp-account"
-                        string="Customer Refunds"
-                        domain="[('type','=','out_refund')]"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-account"
-                        string="Supplier Invoices"
-                        domain="[('type','=','in_invoice')]"/>
-                    <filter icon="terp-account"
-                        string="Supplier Refunds"
-                        domain="[('type','=','in_refund')]"/>
+                <group string="Extended options..." colspan="10" col="12">
+                	<filter string="Done"
+                   			icon="terp-account"
+                   			domain="[('state','=','paid')]"
+                   			help = "Done tasks"/>
+                   	<filter string="Cancelled"
+                		icon="terp-account"
+                		domain="[('state', '=' ,'cancel')]"
+                		help = "Cancelled tasks"/>
+                	<separator orientation="vertical"/>
+                	<field name="payment_term" widget="selection"/>
+                	<field name="currency_id" widget="selection"/>
+                	<field name="journal_id" widget="selection"/>
+                	<newline/>
+            		<field name="type"/>
+                	<field name="period_id" widget="selection"/>
+                	<field name="fiscal_position" widget="selection"/>
+					<field name="date"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}"/>
+                    <filter string="Company" icon="terp-account" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <filter string="Salesman" name='User' icon="terp-account" context="{'group_by':'user_id'}"/>
                     <filter string="Payment Term" icon="terp-account" context="{'group_by':'payment_term'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Currency" icon="terp-account" context="{'group_by':'currency_id'}"/>
                     <filter string="Journal" icon="terp-account" context="{'group_by':'journal_id'}"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
                     <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
                     <filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-account" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
                 </group>
@@ -122,7 +141,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_User':1,'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>