diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index bfcb2bf54fb..2c9856a0c67 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -15,13 +15,20 @@
                		<field name="month" invisible="1"/>
                		<field name="day" invisible="1"/>
                		<field name="date" invisible="1"/>
+					<field name="company_id" invisible="1"/>
 					<field name="partner_id" invisible="1"/>
+					<field name="product_id" invisible="1"/>
+					<field name="min_date" invisible="1"/>
+					<field name="order_date" invisible="1"/>
+					<field name="date_done" invisible="1"/>
+					<field name="max_date" invisible="1"/>
 					<field name="type" invisible="1"/>
+					<field name="invoice_state" invisible="1"/>
 					<field name="state" invisible="1"/>
 					<field name="product_qty" sum="# of Products" />
 					<field name="nbp" sum="# of Pickings" />
 					<field name="nbr" sum="# of Lines" />
-			        <field name="avg_days_to_deliver" sum='Avg Days to Deliver'/>
+			        <field name="avg_days_to_deliver" avg='Avg Days to Deliver'/>
 				</tree>
             </field>
         </record>
@@ -47,27 +54,44 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="6">
-                   		<filter icon="terp-stock" string="This Year"
+                   		<filter icon="terp-stock" 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="Picking in this year"/>
-	                	<filter icon="terp-stock" string="This Month"
+	                    	    help="Picking in last 365 days"/>
+	                	<filter icon="terp-stock" string="Last 30 Days"
 	                			name="month"
 	                			domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                			help="Picking in this month"/>
+	                			help="Picking in last 30 days"/>
                         <separator orientation="vertical"/>
                         <filter string="Todo" icon="terp-stock" domain="[('state','in',('draft','auto','confirmed','assigned'))]"/>
                         <filter string="Done" icon="terp-stock" domain="[('state','=','done')]"/>
 						<separator orientation="vertical"/>
 						<field name="partner_id"/>
-						<field name="type" groups="base.group_extended"/>
+						<field name="company_id" groups="base.group_extended" widget="selection"/>
                    </group>
+                   <newline/>
+                	<group expand="0" string="Extended options..." colspan="10" col="12">
+                		<field name="type"/>
+                		<separator orientation="vertical"/>
+                		<field name="min_date"/>
+                		<separator orientation="vertical"/>
+                		<field name="max_date"/>
+	                    <newline/>
+	                    <field name="invoice_state"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="order_date"/>
+	                    <separator orientation="vertical"/>
+	                    <field name="date_done"/>
+                	</group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="5">
                         <filter string="Partner" name="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Company" icon="terp-stock" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Invoice Status" icon="terp-stock" domain="[]" context="{'group_by':'invoice_state'}"/>
                     	<separator orientation="vertical"/>
-                    	<filter string="Shipping Type" icon="terp-stock" domain="[]" context="{'group_by':'type'}"/>
+                    	<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                     	<filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
+                    	<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                     	<separator orientation="vertical"/>
                         <filter string="Day" icon="terp-stock" domain="[]" context="{'group_by':'day'}"/>
                     	<filter string="Month" icon="terp-stock" domain="[]" context="{'group_by':'month'}"/>