diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index dbd5ac7db44..9f1b233a1f0 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -33,68 +33,68 @@
         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
     
-	
-	<record id="action_quotation_for_sale" model="ir.actions.act_window">
-	    <field name="name">My Quotations</field>
-	    <field name="res_model">sale.order</field>
-	    <field name="view_type">form</field>
-	    <field name="view_mode">tree,form</field>
-	    <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
-	    <field name="view_id" ref="sale.view_order_tree"/>
-    	</record>
-	
-	<record id="view_turnover_by_month_tree" model="ir.ui.view">
-	    <field name="name">turnover.by.month.tree</field>
-	    <field name="model">account.invoice.report</field>
-	    <field name="type">tree</field>
+    
+    <record id="action_quotation_for_sale" model="ir.actions.act_window">
+        <field name="name">My Quotations</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+        <field name="view_id" ref="sale.view_order_tree"/>
+        </record>
+    
+    <record id="view_turnover_by_month_tree" model="ir.ui.view">
+        <field name="name">turnover.by.month.tree</field>
+        <field name="model">account.invoice.report</field>
+        <field name="type">tree</field>
             <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-	    <field name="priority" eval="32"/>
-	    <field name="arch" type="xml">
-	        <tree string="Monthly Turnover">
-	            <field name="month"/>
-	            <field name="price_total"/>
-	        </tree>
-	    </field>
-	</record>
-	
-	<record id="view_turnover_by_month_graph" model="ir.ui.view">
-	    <field name="name">turnover.by.month.graph</field>
-	    <field name="model">account.invoice.report</field>
+        <field name="priority" eval="32"/>
+        <field name="arch" type="xml">
+            <tree string="Monthly Turnover">
+                <field name="month"/>
+                <field name="price_total"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record id="view_turnover_by_month_graph" model="ir.ui.view">
+        <field name="name">turnover.by.month.graph</field>
+        <field name="model">account.invoice.report</field>
             <!-- Lower priority to avoid conflicting with default accounting views for reports -->
-	    <field name="priority" eval="32"/>
-	    <field name="type">graph</field>
-	    <field name="arch" type="xml">
-		<graph string="Monthly Turnover" type="bar">
-		    <field name="month"/>
-		    <field name="price_total" operator="+"/>
-		</graph>
-	    </field>
-	</record>
-	
-	<record model="ir.actions.act_window" id="action_turnover_by_month">
-	    <field name="name">Monthly Turnover</field>
-	    <field name="res_model">account.invoice.report</field>
-	    <field name="view_type">form</field>
-	    <field name="view_mode">graph,tree</field>
-	    <field name="view_id" ref="view_turnover_by_month_graph"/>
-	    <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
-	    <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
-	    <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
+        <field name="priority" eval="32"/>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+        <graph string="Monthly Turnover" type="bar">
+            <field name="month"/>
+            <field name="price_total" operator="+"/>
+        </graph>
+        </field>
+    </record>
+    
+        <record model="ir.actions.act_window" id="action_turnover_by_month">
+            <field name="name">Monthly Turnover</field>
+            <field name="res_model">account.invoice.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_turnover_by_month_graph"/>
+            <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
+            <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+            <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
+       </record>
+
+       <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
+            <field name="act_window_id" ref="action_turnover_by_month"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_turnover_by_month_graph"/>
         </record>
-	
-	<record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
-	    <field name="act_window_id" ref="action_turnover_by_month"/>
-	    <field name="view_mode">graph</field>
-	    <field name="view_id" ref="view_turnover_by_month_graph"/>
+
+        <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
+            <field name="act_window_id" ref="action_turnover_by_month"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_turnover_by_month_tree"/>
         </record>
-	
-	<record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
-	    <field name="act_window_id" ref="action_turnover_by_month"/>
-	    <field name="view_mode">tree</field>
-	    <field name="view_id" ref="view_turnover_by_month_tree"/>
-        </record>
-	
-	<record id="board_sales_form" model="ir.ui.view">
+    
+        <record id="board_sales_form" model="ir.ui.view">
             <field name="name">board.sales.form</field>
             <field name="model">board.board</field>
             <field name="type">form</field>
@@ -103,33 +103,32 @@
                     <hpaned position="100">
                         <child1>
                             <action
-				name="%(action_quotation_for_sale)d"
-				string="My Quotations"
-				height="150"
-				width="510"
-				groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"/>
+                name="%(action_quotation_for_sale)d"
+                string="My Quotations"
+                height="150"
+                width="510"
+                groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"/>
                         </child1>
-			<child2>
-			    <action
-				string="Monthly Turnover"
-				name="%(action_turnover_by_month)d"
-				groups="base.group_sale_salesman,account.group_account_manager"
-				colspan="4"/>
-			</child2>
+            <child2>
+                <action
+                string="Monthly Turnover"
+                name="%(action_turnover_by_month)d"
+                groups="base.group_sale_salesman,account.group_account_manager"
+                colspan="4"/>
+            </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
-	
-	<record id="open_board_sales" model="ir.actions.act_window">
+    
+        <record id="open_board_sales" model="ir.actions.act_window">
             <field name="name">Sales Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_form"/>
         </record>
-	
-	<menuitem action="open_board_sales" icon="terp-graph" id="menu_board_sales" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
+        <menuitem action="open_board_sales" icon="terp-graph" id="menu_board_sales" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/stock_demo_picking.yml b/addons/stock/stock_demo_picking.yml
new file mode 100644
index 00000000000..8b7e6d06514
--- /dev/null
+++ b/addons/stock/stock_demo_picking.yml
@@ -0,0 +1,21 @@
+-
+  !record {model: stock.picking, id: stock_picking_1}:
+    type: out
+    company_id: base.main_company
+    address_id: res_partner_address_fabien0
+    move_lines:
+      - product_id: product.product_product_cpu1
+        product_uom: product.product_uom_unit
+        product_uos_qty: 5.0
+        product_qty: 5.0
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: CPU1, Processor AMD Athlon XP 1800
+      - product_id: product.product_product_cpu3
+        product_uom: product.product_uom_unit
+        product_uos_qty: 5.0
+        product_qty: 5.0
+        location_dest_id: stock.stock_location_customers
+        location_id: stock.stock_location_stock
+        name: CPU3, Processor AMD Athlon XP 1800
+