[IMP]:sale:Improved SQL view report.(Sale Order)

bzr revid: apa@tinyerp.com-20100422052707-x05g643mo7lcxy7z

2 files changed, 60 insertions, 41 deletions

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 6db3b9e044b..d1081a4b21f 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -34,6 +34,7 @@ class sale_report(osv.osv):
         '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),
+        'day': fields.char('Day', size=128, readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
@@ -67,6 +68,7 @@ class sale_report(osv.osv):
                      s.date_order as date,
                      to_char(s.date_order, 'YYYY') as year,
                      to_char(s.date_order, 'MM') as month,
+                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                      l.product_id as product_id,
                      sum(l.product_uom_qty * u.factor) as product_qty,
                      s.partner_id as partner_id,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index dcd7729b1c5..72707f6e01d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -7,15 +7,16 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sales Orders 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="shop_id" 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"/>
@@ -46,57 +47,73 @@
         <field name="arch" type="xml">
             <search string="Sale Orders">
             	<group>
-                <filter icon="terp-sale"
-                    string="This Year"
-                    domain="[('year','=',time.strftime('%%Y'))]"
-                    default="1"
-                    help="Sales orders of the year"/>
-                <filter icon="terp-sale"
-                    string="This Month"
-                    default="1"
-                    domain="[('month','=',time.strftime('%%m'))]"
-                    help="Sales orders of this month"/>
-                <separator orientation="vertical"/>
-                <filter icon="terp-sale"
-                    string="Quotations"
-                    domain="[('state','=','draft')]"/>
-                <filter icon="terp-sale"
-                    string="Sales"
-                    default="1"
-                    domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
-                <separator orientation="vertical"/>
-                <field name="user_id" widget="selection">
-                    <filter icon="terp-sale"
-                        help="My Sales"
-                        domain="[('user_id','=',uid)]"/>
-                </field>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+            	    <filter icon="terp-sale" 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="Tasks performed in this year"/>
+	                <filter icon="terp-sale" 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="Tasks performed in 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="Tasks during last 7 days"/>
+	                <separator orientation="vertical"/>
+	                <filter icon="terp-sale"
+	                    	string="Quotations"
+	                    	domain="[('state','=','draft')]"/>
+	                <filter icon="terp-sale"
+	                		string="Waiting Schedule"
+	                		domain="[('state','=','waiting_date')]"/>
+	                <filter icon="terp-sale"
+	                		string="In progress"
+	                		domain="[('state','=','progress')]"/>
+
+	                <separator orientation="vertical"/>
+	                <field name="user_id" widget="selection">
+	                    <filter icon="terp-sale"
+	                    		string="My Sales"
+	                    		help = "My Sales"
+	                    		domain="[('user_id','=',uid)]" />
+	                    <filter icon="terp-sale"
+	                    		string="sale Non User"
+	                    		help="sale Non User"
+	                    		domain="[('user_id','=',False)]"/>
+	                </field>
+	                <field name="partner_id"/>
+	                <field name="product_id"/>
 				</group>
 				<newline/>
-                <group expand="1" string="Extended options..." colspan="10" col="12">
-                    <filter icon="terp-sale" string="Waiting Schedule" domain="[('state','=','waiting_date')]"/>
-                    <filter icon="terp-sale" string="Manual In Progress" domain="[('state','=','manual')]"/>
-                    <filter icon="terp-sale" string="In Progress" domain="[('state','=','progress')]"/>
+                <group expand="0" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-sale" string="Shipping Exception" domain="[('state','=','shipping_except')]"/>
-                    <filter icon="terp-sale" string="Invoice Exception" domain="[('state','=','invoice_except')]"/>
+                    <filter icon="terp-sale" string="       Invoice Exception      " domain="[('state','=','invoice_except')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="shop_id" widget="selection"/>
+                    <field name="payment_term" widget="selection"/>
+                    <field name="fiscal_position" widget="selection"/>
+                    <newline/>
+                    <filter icon="terp-sale" string="Manual In Progress" domain="[('state','=','manual')]"/>
                     <filter icon="terp-sale" string="Done" domain="[('state','=','done')]"/>
                     <filter icon="terp-sale" string="Cancelled" domain="[('state','=','cancel')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="date"/>
                 </group>
                 <newline/>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
-                    <filter string="Company" icon="terp-sale" context="{'group_by':'company_id'}"/>
+                    <filter string="Company" icon="terp-sale" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
-                    <filter string="Salesman" icon="terp-sale" name="user_id" context="{'group_by':'user_id'}"/>
+                    <filter string="Salesman" icon="terp-sale" name="User" context="{'group_by':'user_id'}"/>
+                    <filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
                     <filter string="Payment Term" icon="terp-sale" context="{'group_by':'payment_term'}"/>
                     <filter string="State" icon="terp-sale" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Fiscal Position" icon="terp-sale" context="{'group_by':'fiscal_position'}"/>
+					<filter string="Day" icon="terp-sale" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-sale" context="{'group_by':'date'}"/>
                     <filter string="Year" icon="terp-sale" context="{'group_by':'year'}"/>
                 </group>
@@ -110,7 +127,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="search_view_id" ref="view_order_product_search"/>
-        <field name="context">{'search_default_user_id': 1}</field>
+        <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
     </record>
 
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>