diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5c947be57ff..5eec70237fd 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -24,6 +24,10 @@
                    <newline/>
                    <group col='8' colspan='15' expand='1' string='Group by...'>
                        <filter string='Category' icon="terp-stock" domain="[]" context="{'group_by' : 'categ_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Default UOM' icon="terp-stock" domain="[]" context="{'group_by' : 'uom_id'}" />
+                       <separator orientation="vertical"/>
+                       <filter string='Type' icon="terp-stock" domain="[]" context="{'group_by' : 'type'}" />
                    </group>
                 </search>
             </field>
@@ -41,6 +45,7 @@
                     <field name="categ_id" />
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id"/>
+                    <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
@@ -303,7 +308,7 @@
                     <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
                     <field name="factor" select="1" attrs="{'readonly':[('uom_factor','=','bigger')]}"/>
-					<field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
+                    <field name="factor_inv_data" select="1" string="Factor Data" attrs="{'readonly':[('uom_factor','=','smaller')]}"/>
                     <field name="factor_inv" invisible="1"/>
                     <field name="rounding"/>
                     <field name="uom_factor"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2508ae0d6df..54e206407e1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -84,6 +84,7 @@
                     <field name="invoiced_rate" widget="progressbar"/>
                     <field name="amount_untaxed" sum="Total Untaxed amount"/>
                     <field name="amount_total" sum="Total amount"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -150,11 +151,11 @@
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
                                                 <button colspan="1"
-                                                	name="%(action_view_sale_order_line_make_invoice)d"
-                                                	states="confirmed"
-                                                	string="Make Invoice"
-                                                	type="action"
-                                                	icon="gtk-print" />
+                                                    name="%(action_view_sale_order_line_make_invoice)d"
+                                                    states="confirmed"
+                                                    string="Make Invoice"
+                                                    type="action"
+                                                    icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -266,6 +267,8 @@
                         <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Salesman" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/stock/report_stock_view.xml b/addons/stock/report_stock_view.xml
index 21f7d91a806..655b65a70ee 100644
--- a/addons/stock/report_stock_view.xml
+++ b/addons/stock/report_stock_view.xml
@@ -12,10 +12,12 @@
                         <filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" default="1" />
                         <filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
                         <filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
+                        
                         <separator orientation="vertical"/>
                         <field name="location_id" select="1" />
                         <field name="product_id" select="1" />
                     </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Location" icon="terp-stock" domain="[]"  context="{'group_by':'location_id'}"/>
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index d72106eead6..7b8d9eb13b3 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
-
-
-<!--        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>-->
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
-
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml"/>
-
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
-
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>
-
     </data>
 </openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c5a0430a405..808e0f9d317 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -4,7 +4,7 @@
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
-   		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
+        <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
 
@@ -18,11 +18,10 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
-					<button name="%(stock.action_view_stock_inventory_line_split)d"
-                    		 		string="Split inventory lines"
-                      		 		type="action" icon="gtk-justify-fill"/>                    
+                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                            string="Split inventory lines"
+                            type="action" icon="gtk-justify-fill"/>                    
                     <field name="location_id"/>
-                    
                 </tree>
             </field>
         </record>
@@ -37,9 +36,9 @@
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>                  
-                    	 <button name="%(stock.action_view_stock_inventory_line_split)d"
-                    		 		string="Split inventory lines"
-                      		 		type="action" icon="gtk-justify-fill"/>
+                        <button name="%(stock.action_view_stock_inventory_line_split)d"
+                            string="Split inventory lines"
+                            type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -91,10 +90,10 @@
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-								<field name="state" invisible="1"/>
-								<button name="%(stock.action_view_stock_inventory_line_split)d"
-                    		 		string="Split inventory lines"
-                      		 		type="action" icon="gtk-justify-fill" states="draft"/>
+                                <field name="state" invisible="1"/>
+                                <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                    string="Split inventory lines"
+                                    type="action" icon="gtk-justify-fill" states="draft"/>
                             </tree>
                             <form string="Inventory Lines">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
@@ -103,10 +102,10 @@
                                 <field  domain="[('usage','=','internal')]" name="location_id" select="1"/>
                                 <field name="prod_lot_id"/>
                                 <group colspan="2" col="3">
-                                   <button name="%(stock.action_view_stock_inventory_line_split)d"
-                     		 				string="Split inventory lines"
-                      		 				type="action" icon="gtk-justify-fill"/>
-								</group>
+                                    <button name="%(stock.action_view_stock_inventory_line_split)d"
+                                        string="Split inventory lines"
+                                        type="action" icon="gtk-justify-fill"/>
+                                </group>
                             </form>
                         </field>
                     </page><page string="Posted Inventory">
@@ -284,7 +283,6 @@
             </field>
         </record>
 
-
         <record id="action_production_lot_form" model="ir.actions.act_window">
             <field name="name">Production Lots</field>
             <field name="type">ir.actions.act_window</field>
@@ -431,6 +429,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -589,19 +588,19 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="confirmed,assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                            states="confirmed,assigned" 
+                            string="Make Picking" 
+                            type="action" 
+                            icon="gtk-go-forward"
+                            help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                            states="done" 
+                            string="Return Picking" 
+                            type="action"
+                            icon="gtk-go-back" 
+                            help="Return Picking" colspan="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -617,53 +616,53 @@
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                        name="%(stock.track_line)d"
+                                        string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="2"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="2"/>
-		                                    <newline/>
-		                                    <label/>
-		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="2"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="2"/>
+                                            <newline/>
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -696,7 +695,6 @@
             </field>
         </record>
 
-
         <record id="view_stock_picking_filter" model="ir.ui.view">
             <field name="name">stock.picking.list.select</field>
             <field name="model">stock.picking</field>
@@ -757,19 +755,19 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                                states="assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
+                    </group>
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -785,48 +783,48 @@
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="2"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="2"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
                                 </form>
                             </field>
                             <group col="7" colspan="4">
@@ -854,7 +852,7 @@
                             <field name="date_done" select="2"/>
                             <field name="move_type"/>
                         </page>
-                    </notebook>					
+                    </notebook>                    
                 </form>
             </field>
         </record>
@@ -952,19 +950,19 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                                states="assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@ -980,51 +978,51 @@
                                     <field name="date_planned"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="draft,waiting,confirmed,assigned" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
- 										<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
-		                                    <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field invisible="1" name="date"/>
-		                                    <field name="date_planned"/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <field name="prodlot_id" select="1"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <label/>
-		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
-		                                    </group>
-                                    	</page>
-                                		<page string="Return Picking History">
-                        					<field name="move_stock_return_history" nolabel="1"/>
-                        				</page>
-                        			</notebook>
-								</form>
+                                    <notebook colspan="4">
+                                         <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
+                                            <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field invisible="1" name="date"/>
+                                            <field name="date_planned"/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <field name="prodlot_id" select="1"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <label/>
+                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
+                                            <field name="move_stock_return_history" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
@@ -1056,13 +1054,13 @@
             </field>
         </record>
 
-		<record id="view_picking_out_search" model="ir.ui.view">
+        <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
-                	<group col="8" colspan="4">
+                    <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
@@ -1074,8 +1072,8 @@
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>
+                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1144,19 +1142,19 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-	                    <button name="%(make_picking)d" 
-	                    		states="confirmed,assigned" 
-	                    		string="Make Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-forward" 
-	                    		help="Make Picking" colspan="2"/>
-	                    <button name="%(return_picking)d" 
-	                    		states="done" 
-	                    		string="Return Picking" 
-	                    		type="action" 
-	                    		icon="gtk-go-back" 
-	                    		help="Return Picking" colspan="2"/>
-	                </group>
+                        <button name="%(make_picking)d" 
+                                states="confirmed,assigned" 
+                                string="Make Picking" 
+                                type="action" 
+                                icon="gtk-go-forward" 
+                                help="Make Picking" colspan="2"/>
+                        <button name="%(return_picking)d" 
+                                states="done" 
+                                string="Return Picking" 
+                                type="action" 
+                                icon="gtk-go-back" 
+                                help="Return Picking" colspan="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
@@ -1168,50 +1166,50 @@
                                     <field name="prodlot_id"/>
                                     <field name="state"/>
                                     <button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="draft,waiting,confirmed,assigned" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="D" type="action"
-                           				icon="gtk-convert"
-                           				states="done,cancel" />
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="D" type="action"
+                                           icon="gtk-convert"
+                                           states="done,cancel" />
                                 </tree>
                                 <form string="Stock Moves">
-                                	<notebook colspan="4">
-                                		<page string="General Information">
-		                                    <separator colspan="4" string="Move Information"/>
-		                                    <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
-		                                    <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
-		                                    <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-		                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field name="product_uom" select="1"/>
-		                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                                    <field groups="product.group_uos" name="product_uos_qty"/>
-		                                    <field colspan="4" invisible="1" name="name" select="1"/>
-		                                    <field groups="base.group_extended" name="date_planned"/>
-		                                    <newline/>
-		                                    <newline/>
-		                                    <field groups="base.group_extended" name="product_packaging"/>
-		                                    <newline/>
-		                                    <field name="prodlot_id" select="1"
-		                                        context="{'location_id':location_id, 'product_id':product_id}"
-		                                        domain="[('product_id','=?',product_id)]"
-		                                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                                    <field groups="base.group_extended" name="tracking_id" select="1"/>
-		                                    <newline/>
-		                                    <label/>
-		                                    <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                                    <separator colspan="4" string="Move State"/>
-		                                    <field name="state" select="1"/>
-		                                    <group>
-		                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
-		                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
-		                                        <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
-		                                    </group>
-		                                </page>
-		                                <page string="Return Picking History">
+                                    <notebook colspan="4">
+                                        <page string="General Information">
+                                            <separator colspan="4" string="Move Information"/>
+                                            <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
+                                            <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
+                                            <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field name="product_uom" select="1"/>
+                                            <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                            <field groups="product.group_uos" name="product_uos_qty"/>
+                                            <field colspan="4" invisible="1" name="name" select="1"/>
+                                            <field groups="base.group_extended" name="date_planned"/>
+                                            <newline/>
+                                            <newline/>
+                                            <field groups="base.group_extended" name="product_packaging"/>
+                                            <newline/>
+                                            <field name="prodlot_id" select="1"
+                                                context="{'location_id':location_id, 'product_id':product_id}"
+                                                domain="[('product_id','=?',product_id)]"
+                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field groups="base.group_extended" name="tracking_id" select="1"/>
+                                            <newline/>
+                                            <label/>
+                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <separator colspan="4" string="Move State"/>
+                                            <field name="state" select="1"/>
+                                            <group>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon=""/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon=""/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon=""/>
+                                            </group>
+                                        </page>
+                                        <page string="Return Picking History">
                                                     <field name="move_stock_return_history" nolabel="1"/>
                                                 </page>
                                             </notebook>
@@ -1467,11 +1465,11 @@
         </record>
         <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_stock_warehouse_mgmt" sequence="3"/>
 
-	    ====================================
+        ====================================
         Reception Picking (By Stock Move)
         ====================================
 
-	    <record id="view_move_tree_reception_picking" model="ir.ui.view">
+        <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
@@ -1494,84 +1492,84 @@
             </field>
         </record>
 
-	    <record id="view_move_form_reception_picking" model="ir.ui.view">
+        <record id="view_move_form_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.form2</field>
             <field name="model">stock.move</field>
             <field name="type">form</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Moves">
-                	<notebook colspan="4">
-                		<page string="General Information">
-		                    <separator colspan="4" string="Move Information"/>
-		                    <field name="location_id" select="1"/>
-		                    <field name="location_dest_id" select="1"/>
-		                    <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
-		                    <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-		                    <field name="product_uom" select="2"/>
-		                    <field name="product_uos" select="2"/>
-		                    <field colspan="4" name="name" select="2"/>
-		                    <field name="date"/>
-		                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-		                    <field name="date_planned"/>
-		                    <field name="priority"/>
-		                    <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
-		                    <newline/>
-		                    <field name="picking_id" select="2"/>
-		                    <newline/>
-		                    <field name="prodlot_id" select="2"
-		                        context="{'location_id':location_id, 'product_id':product_id}"
-		                        domain="[('product_id','=?',product_id)]"
-		                        on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-		                    <field name="tracking_id" select="2"/>
-		                    <newline/>
-		                    <label/>
-		                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-		                    <separator colspan="4" string="Move State"/>
-		                    <field name="state" select="1"/>
-		                    <group col="5" colspan="2">
-		                        <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-		                        <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-		                        <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <notebook colspan="4">
+                        <page string="General Information">
+                            <separator colspan="4" string="Move Information"/>
+                            <field name="location_id" select="1"/>
+                            <field name="location_dest_id" select="1"/>
+                            <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
+                            <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                            <field name="product_uom" select="2"/>
+                            <field name="product_uos" select="2"/>
+                            <field colspan="4" name="name" select="2"/>
+                            <field name="date"/>
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                            <field name="date_planned"/>
+                            <field name="priority"/>
+                            <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
+                            <newline/>
+                            <field name="picking_id" select="2"/>
+                            <newline/>
+                            <field name="prodlot_id" select="2"
+                                context="{'location_id':location_id, 'product_id':product_id}"
+                                domain="[('product_id','=?',product_id)]"
+                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                            <field name="tracking_id" select="2"/>
+                            <newline/>
+                            <label/>
+                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                            <separator colspan="4" string="Move State"/>
+                            <field name="state" select="1"/>
+                            <group col="5" colspan="2">
+                                <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
+                                <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+                                <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="%(partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
-		                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
-		                    </group>
-		                </page>
-		                <page string="Return Picking History">
-							<field name="move_stock_return_history" nolabel="1"/>
- 						</page>
-		            </notebook>
+                                <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                            </group>
+                        </page>
+                        <page string="Return Picking History">
+                            <field name="move_stock_return_history" nolabel="1"/>
+                         </page>
+                    </notebook>
                 </form>
             </field>
         </record>
 
-	    <record id="view_move_search_reception_picking" model="ir.ui.view">
+        <record id="view_move_search_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.search2</field>
             <field name="model">stock.move</field>
             <field name="type">search</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
-            	<search string="Stock Moves">
-            		<group col="8" colspan="4">
-	            		<filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
-	            		<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
-	            		<filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
-	            		<separator orientation="vertical"/>
+                <search string="Stock Moves">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" default="1" help="Stock to be received"/>
+                        <filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
+                        <filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
+                        <separator orientation="vertical"/>
                         <field name="origin" string="Latest Requisition" select="1"/>
-	            		<field name="partner_id" string="Supplier" select="1"/>
-	                    <field name="product_id"/>
+                        <field name="partner_id" string="Supplier" select="1"/>
+                        <field name="product_id"/>
                     </group>   
                     <newline/>                 
                     <group expand="1" string="Group By..." colspan="4" col="8">
-						<filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
-						<filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>
-            	</search>
+                        <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
-    	<record id="action_reception_picking_move" model="ir.actions.act_window">
+        <record id="action_reception_picking_move" model="ir.actions.act_window">
             <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
@@ -1583,17 +1581,17 @@
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="view_move_tree_reception_picking"/>
-	        <field name="act_window_id" ref="action_reception_picking_move"/>
-	    </record>
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_tree_reception_picking"/>
+            <field name="act_window_id" ref="action_reception_picking_move"/>
+        </record>
         <record model="ir.actions.act_window.view" id="action_move_reception_picking_form">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="view_move_form_reception_picking"/>
-	        <field name="act_window_id" ref="action_reception_picking_move"/>
-	    </record>
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_form_reception_picking"/>
+            <field name="act_window_id" ref="action_reception_picking_move"/>
+        </record>
 <!--        <menuitem action="action_reception_picking_move" id="menu_action_reception_picking_move" parent="menu_stock_warehouse_mgmt" sequence="4"/>-->
 
 
@@ -1680,78 +1678,78 @@
             <field eval="True" name="object"/>
         </record>  
 
-		<!-- Graph Views -->
-		<!--  Products To Received Vs Planned -->
-		<record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
-	        <field name="name">Products To Received</field>
-	        <field name="model">report.products.to.received.planned</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-		        <tree string="Products To Received" >
-		            <field name="qty" />
-		            <field name="planned_qty" />
-		            <field name="date"/>
-		        </tree>
-	        </field>
-	    </record>
+        <!-- Graph Views -->
+        <!--  Products To Received Vs Planned -->
+        <record model="ir.ui.view" id="view_move_graph_reception_picking_tree">
+            <field name="name">Products To Received</field>
+            <field name="model">report.products.to.received.planned</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products To Received" >
+                    <field name="qty" />
+                    <field name="planned_qty" />
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_move_graph_reception_picking">
-	        <field name="name">Products To Received</field>
-	        <field name="model">report.products.to.received.planned</field>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	        <graph string="Products To Received" type="bar" orientation="vertical">
-				<field name="date"/>
-	            <field name="qty" operator="+"/>
-	            <field name="planned_qty" operator="+"/>
-	        </graph>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_move_graph_reception_picking">
+            <field name="name">Products To Received</field>
+            <field name="model">report.products.to.received.planned</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Products To Received" type="bar" orientation="vertical">
+                <field name="date"/>
+                <field name="qty" operator="+"/>
+                <field name="planned_qty" operator="+"/>
+            </graph>
+            </field>
+        </record>
 
-	    <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
-	        <field name="name">Number of Products to receive Vs planned</field>
-	        <field name="res_model">report.products.to.received.planned</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_move_graph_reception_picking"/>
-	    </record>
+        <record id="action_move_graph_reception_picking" model="ir.actions.act_window">
+            <field name="name">Number of Products to receive Vs planned</field>
+            <field name="res_model">report.products.to.received.planned</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_move_graph_reception_picking"/>
+        </record>
 
-		<!--  Delivery Product Vs Planned -->
-		<record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
-	        <field name="name">Delivery Products</field>
-	        <field name="model">report.delivery.products.planned</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-		        <tree string="Products To Received" >
-		            <field name="qty" />
-		            <field name="planned_qty" />
-		            <field name="date"/>
-		        </tree>
-	        </field>
-	    </record>
+        <!--  Delivery Product Vs Planned -->
+        <record model="ir.ui.view" id="view_move_delivery_products_planned_tree">
+            <field name="name">Delivery Products</field>
+            <field name="model">report.delivery.products.planned</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Products To Received" >
+                    <field name="qty" />
+                    <field name="planned_qty" />
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
-		<record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
-	        <field name="name">Delivery Products</field>
-	        <field name="model">report.delivery.products.planned</field>
-	        <field name="type">graph</field>
-	        <field name="arch" type="xml">
-	        <graph string="Products To Received" type="bar" orientation="vertical">
-	        	<field name="date"/>
-	            <field name="qty" operator="+"/>
-	            <field name="planned_qty" operator="+"/>
-	        </graph>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_move_delivery_products_planned_graph">
+            <field name="name">Delivery Products</field>
+            <field name="model">report.delivery.products.planned</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+            <graph string="Products To Received" type="bar" orientation="vertical">
+                <field name="date"/>
+                <field name="qty" operator="+"/>
+                <field name="planned_qty" operator="+"/>
+            </graph>
+            </field>
+        </record>
 
-	    <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
-	        <field name="name">Delivery Products Vs Planned</field>
-	        <field name="res_model">report.delivery.products.planned</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
-	    </record>
+        <record id="action_move_delivery_products_planned" model="ir.actions.act_window">
+            <field name="name">Delivery Products Vs Planned</field>
+            <field name="res_model">report.delivery.products.planned</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
+        </record>
 
     </data>
 </openerp>