diff --git a/addons/account_anglo_saxon/test/anglo_saxon.yml b/addons/account_anglo_saxon/test/anglo_saxon.yml
index 3ea85fc0d73..0a2dcf5f5fc 100644
--- a/addons/account_anglo_saxon/test/anglo_saxon.yml
+++ b/addons/account_anglo_saxon/test/anglo_saxon.yml
@@ -195,6 +195,7 @@
         product_qty: 1.0
         product_uom: product.product_uom_unit
         location_dest_id: stock.stock_location_customers
+        invoice_state: 2binvoiced
     move_type: direct
     picking_type_id: stock.picking_type_out
 -
diff --git a/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
index bb6200e148b..d4a2fbaaab1 100644
--- a/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
+++ b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
@@ -197,18 +197,19 @@
         product_id: product_fifo_anglo_saxon
         product_qty: 1.0
         location_dest_id: stock.stock_location_customers
+        invoice_state: 2binvoiced
     move_type: direct
     picking_type_id: stock.picking_type_out
 -
   I need to check the availability of the product, So I make my picking order for processing later.
 -
   !python {model: stock.picking}: |
-    self.action_confirm(cr, uid, [ref('stock_picking_out001')], context=context)
+    self.action_confirm(cr, uid, [ref('stock_picking_out001_fifo')], context=context)
 -
   I check the product availability, Product is available in the stock and ready to be sent.
 -
   !python {model: stock.picking}: |
-    picking = self.browse(cr, uid, ref("stock_picking_out001"))
+    picking = self.browse(cr, uid, ref("stock_picking_out001_fifo"))
     assert picking.state == "confirmed", "Picking should be confirmed."
     for move_line in picking.move_lines:
       assert move_line.state == "confirmed", "Move should be confirmed."
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 22a14addcd1..840d6c71086 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -44,11 +44,6 @@ class mrp_config_settings(osv.osv_memory):
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
                 This installs the module mrp_byproduct."""),
-        'module_mrp_jit': fields.boolean("Generate procurement in real time",
-            help="""This allows Just In Time computation of procurement orders.
-                All procurement orders will be processed immediately, which could in some
-                cases entail a small performance impact.
-                This installs the module mrp_jit."""),
         'module_stock_no_autopicking': fields.boolean("Manage manual picking to fulfill manufacturing orders ",
             help="""This module allows an intermediate picking process to provide raw materials to production orders.
                 For example to manage production made by your suppliers (sub-contracting).
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 2c7047380a8..25f3e0b0931 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -44,10 +44,6 @@
                     <group >
                         <label for="id" string="Planning"/>
                         <div>
-                            <div>
-                                <field name="module_mrp_jit" class="oe_inline"/>
-                                <label for="module_mrp_jit"/>
-                            </div>
                             <div>
                                 <field name="group_mrp_routings" class="oe_inline"/>
                                 <label for="group_mrp_routings"/>
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 945ad269db9..b1e4773f99f 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -44,6 +44,6 @@ In that case, you can not use priorities any more on the different picking.
     'demo': [],
     'test': ['test/mrp_jit.yml'],
     'installable': True,
-    'auto_install': False,
+    'auto_install': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_jit/mrp_jit.py b/addons/mrp_jit/mrp_jit.py
index 01d94692a9d..4ad5cca5f20 100644
--- a/addons/mrp_jit/mrp_jit.py
+++ b/addons/mrp_jit/mrp_jit.py
@@ -27,7 +27,6 @@ class procurement_order(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         procurement_id = super(procurement_order, self).create(cr, uid, vals, context=context)
-        # TODO: maybe this is not necessary anymore as we do this already
         self.run(cr, uid, [procurement_id], context=context)
         self.check(cr, uid, [procurement_id], context=context)
         return procurement_id
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 591f65cf925..4767d90f188 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -642,6 +642,7 @@ class pos_order(osv.osv):
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
         'account_move': fields.many2one('account.move', 'Journal Entry', readonly=True),
         'picking_id': fields.many2one('stock.picking', 'Picking', readonly=True),
+        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', required=True),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
         'pos_reference': fields.char('Receipt Ref', size=64, readonly=True),
@@ -660,6 +661,13 @@ class pos_order(osv.osv):
             return session_record.config_id.pricelist_id and session_record.config_id.pricelist_id.id or False
         return False
 
+    def _get_out_picking_type(self, cr, uid, context=None):
+        try:
+            picking_type = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context)
+        except:
+            picking_type = False
+        return picking_type
+
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
         'state': 'draft',
@@ -669,6 +677,7 @@ class pos_order(osv.osv):
         'session_id': _default_session,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         'pricelist_id': _default_pricelist,
+        'picking_type_id': _get_out_picking_type,
     }
 
     def create(self, cr, uid, values, context=None):
@@ -697,18 +706,21 @@ class pos_order(osv.osv):
             if not order.state=='draft':
                 continue
             addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
+            picking_type = order.picking_type_id
             picking_id = picking_obj.create(cr, uid, {
                 'origin': order.name,
                 'partner_id': addr.get('delivery',False),
-                'picking_type_id': self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'picking_type_out', context=context).id,
+                'picking_type_id': picking_type.id,
                 'company_id': order.company_id.id,
                 'move_type': 'direct',
                 'note': order.note or "",
                 'invoice_state': 'none',
             }, context=context)
             self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
-            location_id = order.warehouse_id.lot_stock_id.id
-            output_id = order.warehouse_id.lot_output_id.id
+            location_id = picking_type.default_location_src_id.id
+            output_id = picking_type.default_location_dest_id.id
+            if not location_id or not output_id:
+                raise osv.except_osv(_('Error!'), _('Missing source or destination location for picking type %s. Please configure those fields and try again.' % (picking_type.name,)))
 
             for line in order.lines:
                 if line.product_id and line.product_id.type == 'service':
diff --git a/addons/procurement/test/procurement.yml b/addons/procurement/test/procurement.yml
index 0e663646c84..353bcaff3e8 100644
--- a/addons/procurement/test/procurement.yml
+++ b/addons/procurement/test/procurement.yml
@@ -15,8 +15,8 @@
   !python {model: procurement.order}: |
     self.run_scheduler(cr, uid)
 -
-  I check that procurement order is done
+  I check that procurement order is in exception, as at first there isn't any suitable rule
 -
   !python {model: procurement.order}: |
     proc_order = self.browse(cr, uid, ref('procurement_order0'), context=context)
-    assert proc_order.state == 'done'
+    assert proc_order.state == 'exception'
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index d491985cf52..77d4e310b60 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -26,7 +26,6 @@
                     <field name="product_uom" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="name" invisible="1"/>
-                    <field name="warehouse_id" invisible="1"/>
                     <field name="validator" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 8efacf7f75e..84c915bd130 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -188,7 +188,6 @@ class purchase_order(osv.osv):
             help="Put an address if you want to deliver directly from the supplier to the customer. " \
                 "Otherwise, keep empty to deliver to your own company."
         ),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'currency_id': fields.many2one('res.currency','Currency', readonly=True, required=True,states={'draft': [('readonly', False)],'sent': [('readonly', False)]}),
@@ -234,7 +233,9 @@ class purchase_order(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal'),
         'bid_date': fields.date('Bid Received On', readonly=True, help="Date on which the bid was received"),
         'bid_validity': fields.date('Bid Valid Until', help="Date on which the bid expired"),
-        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', help="This will determine picking type of incoming shipment"),
+        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', help="This will determine picking type of incoming shipment", required=True, 
+                                           states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
+        'related_location_id':fields.related('picking_type_id', 'default_location_dest_id', type='many2one', relation='stock.location', string="Related location", store=True),
     }
     _defaults = {
         'date_order': fields.date.context_today,
@@ -301,18 +302,22 @@ class purchase_order(osv.osv):
         if not address_id:
             return {}
         address = self.pool.get('res.partner')
-        values = {'warehouse_id': False}
+        values = {}
         supplier = address.browse(cr, uid, address_id)
         if supplier:
             location_id = supplier.property_stock_customer.id
             values.update({'location_id': location_id})
         return {'value':values}
 
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id):
-        if not warehouse_id:
-            return {}
-        warehouse = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id)
-        return {'value':{'location_id': warehouse.lot_input_id.id, 'dest_address_id': False}}
+    def onchange_picking_type_id(self, cr, uid, ids, picking_type_id, context=None):
+        value = {}
+        if picking_type_id:
+            picktype = self.pool.get("stock.picking.type").browse(cr, uid, picking_type_id, context=context)
+            if picktype.default_location_dest_id:
+                value.update({'location_id': picktype.default_location_dest_id.id})
+            value.update({'related_location_id': picktype.default_location_dest_id and picktype.default_location_dest_id.id or False})
+        return {'value': value}
+
 
     def onchange_partner_id(self, cr, uid, ids, partner_id):
         partner = self.pool.get('res.partner')
@@ -856,7 +861,7 @@ class purchase_order(osv.osv):
                     'date_order': porder.date_order,
                     'partner_id': porder.partner_id.id,
                     'dest_address_id': porder.dest_address_id.id,
-                    'warehouse_id': porder.warehouse_id.id,
+                    'picking_type_id': porder.picking_type_id.id,
                     'location_id': porder.location_id.id,
                     'pricelist_id': porder.pricelist_id.id,
                     'state': 'draft',
@@ -1242,7 +1247,6 @@ class procurement_order(osv.osv):
                 partner_id = partner.id
                 address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
                 pricelist_id = partner.property_product_pricelist_purchase.id
-                warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id)], context=context)
                 uom_id = procurement.product_id.uom_po_id.id
                 qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
                 if seller_qty:
@@ -1278,7 +1282,7 @@ class procurement_order(osv.osv):
                     'origin': procurement.origin,
                     'partner_id': partner_id,
                     'location_id': procurement.location_id.id,
-                    'warehouse_id': warehouse_id and warehouse_id[0] or False,
+                    'picking_type_id': procurement.rule_id.picking_type_id.id,
                     'pricelist_id': pricelist_id,
                     'date_order': purchase_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
                     'company_id': procurement.company_id.id,
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index afd9560e350..ed8e01634ac 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -44,7 +44,7 @@
         </record>
         
         <function
-            eval="('default',False,'warehouse_id', [('purchase.order', False)], ref('stock.warehouse0'), True, False, False, False, True)"
+            eval="('default',False,'picking_type_id', [('purchase.order', False)], ref('stock.picking_type_in'), True, False, False, False, True)"
             id="purchase_default_set"
             model="ir.values"
             name="set"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 973757770c4..19cb68fe76a 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -196,9 +196,13 @@
                         <group>
                             <field name="date_order"/>
                             <field name="origin" attr="{'invisible': [('origin','=',False)]}"/>
-                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="picking_type_id"/>
+                            <field name="picking_type_id" on_change="onchange_picking_type_id(picking_type_id, context)" domain="[('code_id','=','incoming')]" string="Warehouse / Operation" widget="selection"/>
+                            <field name="related_location_id" invisible="1"/>
+                            <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"
+                                attrs="{'invisible':['|', ('picking_type_id','=',False), ('related_location_id','!=', False)], 
+                                'required': [('picking_type_id','!=',False), ('related_location_id','=', False)]}" 
+                                groups="stock.group_locations"/>
                         </group>
                     </group>
                     <notebook>
@@ -241,7 +245,7 @@
                         <page string="Deliveries &amp; Invoices">
                             <group>
                                 <group>
-                                    <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)" groups="stock.group_locations"/>
+                                    
                                     <field name="minimum_planned_date"/>
                                     <field name="location_id" groups="stock.group_locations"/>
                                     <field name="shipped" groups="base.group_no_one"/>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index faf5b89df45..7c57f8e3c00 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -42,7 +42,7 @@ class purchase_report(osv.osv):
                                       ('done', 'Done'),
                                       ('cancel', 'Cancelled')],'Order Status', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
+        'picking_type_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Supplier', readonly=True),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', readonly=True),
@@ -82,7 +82,7 @@ class purchase_report(osv.osv):
                     s.dest_address_id,
                     s.pricelist_id,
                     s.validator,
-                    s.warehouse_id as warehouse_id,
+                    s.picking_type_id as picking_type_id,
                     s.partner_id as partner_id,
                     s.create_uid as user_id,
                     s.company_id as company_id,
@@ -128,7 +128,7 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'MM'),
                     to_char(s.date_order, 'YYYY-MM-DD'),
                     s.state,
-                    s.warehouse_id,
+                    s.picking_type_id,
                     u.uom_type,
                     u.category_id,
                     t.uom_id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 211f3e9a31a..60bf0885ed9 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -28,7 +28,7 @@
                     <field name="day" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="warehouse_id" invisible="1"/>
+                    <field name="picking_type_id" invisible="1"/>
                     <field name="validator" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="state" invisible="1"/>
@@ -58,7 +58,7 @@
                     <field name="user_id"/>
                     <field name="validator"/>
                     <field name="location_id"/>
-                    <field name="warehouse_id"/>
+                    <field name="picking_type_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="date"/>
                     <field name="date_approve"/>
@@ -72,9 +72,9 @@
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'picking_type_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'picking_type_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 07aefef2e14..18ad626b84b 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -13,15 +13,12 @@
         </record>
 
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
-            <field name="name">Incoming Picking Inherited</field>
+            <field name="name">Picking Inherited</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='date']" position="before">
-                    <field name="purchase_id" domain="[('invoice_method','=','picking')]"  context="{'search_default_partner_id':partner_id,'default_partner_id':partner_id, 'default_invoice_method':'picking'}"/>
-                </xpath>
-                <xpath expr="//field[@name='company_id']" position="after">
-                    <field name="warehouse_id" groups="stock.group_locations"/>
+                <xpath expr="//field[@name='move_type']" position="before">
+                    <field name="purchase_id" domain="[('invoice_method','=','picking')]" groups="base.group_no_one" context="{'search_default_partner_id':partner_id,'default_partner_id':partner_id, 'default_invoice_method':'picking'}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase/test/fifo_price.yml b/addons/purchase/test/fifo_price.yml
index e6488bcc141..3c45cd1c9c1 100644
--- a/addons/purchase/test/fifo_price.yml
+++ b/addons/purchase/test/fifo_price.yml
@@ -28,6 +28,26 @@
         product_uom: product.product_uom_categ_kgm
         price_unit: 50.0
         name: 'FIFO Ice Cream'
+- 
+  I confirm the first purchase order
+-
+  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_fifo1}
+- 
+  I check the "Approved" status of purchase order 1
+-
+  !assert {model: purchase.order, id: purchase_order_fifo1}:
+    - state == 'approved'
+- 
+  Process the reception of purchase order 1 and set date
+-
+  !python {model: stock.picking}: |
+    picking_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo1")).picking_ids[0]
+    picking_obj.do_partial(context=context)
+- 
+  Check the standard price of the product (fifo icecream), that should have not changed because the standard price is supposed to be updated only when goods are going out of the stock
+- 
+  !python {model: product.product}: |
+    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 70.0, 'Standard price should not have changed!'
 - 
   I create a draft Purchase Order for second shipment for 30 kg at 80 euro
 - 
@@ -41,27 +61,6 @@
         product_uom: product.product_uom_categ_kgm
         price_unit: 80.0
         name: 'FIFO Ice Cream'
-- 
-  I confirm the first purchase order
--
-  !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_fifo1}
-- 
-  I check the "Approved" status of purchase order 1
--
-  !assert {model: purchase.order, id: purchase_order_fifo1}:
-    - state == 'approved'
-- 
-  Process the reception of purchase order 1 and set date
--
-  !python {model: stock.partial.picking}: |
-    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo1")).picking_ids
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
-    self.do_partial(cr, uid, [partial_id])
-- 
-  Check the standard price of the product (fifo icecream)
-- 
-  !python {model: product.product}: |
-    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 70.0, 'Standard price should not have changed!'
 - 
   I confirm the second purchase order
 - 
@@ -69,26 +68,11 @@
 - 
   Process the reception of purchase order 2
 - 
-  !python {model: stock.partial.picking}: |
-    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo2")).picking_ids
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    picking_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo2")).picking_ids[0]
+    picking_obj.do_partial(context=context)
 - 
-  A purchase order towards the Chicago shop TODO code for receiving
-- 
-  !record {model: purchase.order, id: purchase_order_fifo_comp}:
-    partner_id: base.res_partner_3
-    company_id: stock.res_company_1
-    location_id: stock.stock_location_shop0
-    pricelist_id: 1
-    order_line:
-      - product_id: product_fifo_icecream
-        product_qty: 35.0
-        product_uom: product.product_uom_categ_kgm
-        price_unit: 50.0
-        name: 'FIFO Ice Cream'
-- 
-  Check the standard price should not have changed
+  Check the standard price of the product, that should have not changed because the standard price is supposed to be updated only when goods are going out of the stock
 - 
   !python {model: product.product}: |
     assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 70.0, 'Standard price as fifo price of second reception incorrect!'
@@ -96,7 +80,7 @@
   Let us send some goods
 - 
   !record {model: stock.picking, id: outgoing_fifo_shipment}:
-    type: out
+    picking_type_id: stock.picking_type_out
 -
   Picking needs movement from stock
 -
@@ -104,8 +88,10 @@
     picking_id: outgoing_fifo_shipment
     product_id: product_fifo_icecream
     product_uom: product.product_uom_kgm
-    product_qty: 20.0
-    type: out
+    product_uom_qty: 20.0
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+    picking_type_id: stock.picking_type_out
 - 
   I assign this outgoing shipment 
 - 
@@ -114,19 +100,19 @@
 - 
   Process the delivery of the outgoing shipment
 - 
-  !python {model: stock.partial.picking}: |
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [ref("outgoing_fifo_shipment")], 'default_type':'out'})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+     pick_obj = self.pool.get('stock.picking').browse(cr, uid, ref("outgoing_fifo_shipment"))
+     pick_obj.do_partial(context=context)
 - 
-  Check product standard price changed to 65.0
+  Check product standard price changed to 65.0 (because last outgoing shipment was made of 10 kg at 50€ and 10 kg at 80€)
 - 
   !python {model: product.product}: |
-    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 65.0
+    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 65.0, "Product price not updated accordingly. %s found instead of 65" %(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price,)
 - 
   Do a delivery of an extra 500 g (delivery order)
 - 
   !record {model: stock.picking, id: outgoing_fifo_shipment_uom}:
-    type: out
+    picking_type_id: stock.picking_type_out
 -
   Picking needs movement from stock
 -
@@ -134,8 +120,10 @@
     picking_id: outgoing_fifo_shipment_uom
     product_id: product_fifo_icecream
     product_uom: product.product_uom_gram
-    product_qty: 500.0
-    type: out
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+    product_uom_qty: 500.0
+    picking_type_id: stock.picking_type_out
 - 
   I assign this outgoing shipment 
 - 
@@ -144,14 +132,14 @@
 -
   Process the delivery of the outgoing shipment
 - 
-  !python {model: stock.partial.picking}: |
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [ref("outgoing_fifo_shipment_uom")], 'default_type':'out'})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    pick_obj = self.pool.get('stock.picking').browse(cr, uid, ref("outgoing_fifo_shipment_uom"))
+    pick_obj.do_partial(context=context)
 - 
-  Check product price changed to 80.0
+  Check product price changed to 80.0 (because last outgoing shipment was made of 0.5 kg at 80€)
 - 
   !python {model: product.product}: |
-    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 80.0
+    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 80.0, "Product price not updated accordingly. %s found instead of 80" %(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price,)
 - 
   We will temporarily change the currency rate on the sixth of June to have the same results all year
 - 
@@ -201,15 +189,14 @@
 - 
   Process the reception of purchase order with usd
 -
-  !python {model: stock.partial.picking}: |
-    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo_usd")).picking_ids
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    pick_obj = self.pool.get('stock.picking').browse(cr, uid, ref("purchase_order_fifo_usd"))
+    pick_obj.do_partial(context=context)
 - 
   We create delivery order of 49.5 kg
 - 
   !record {model: stock.picking, id: outgoing_fifo_shipment_cur}:
-    type: out
+    picking_type_id: stock.picking_type_out
 -
   Picking needs movement from stock
 -
@@ -217,8 +204,10 @@
     picking_id: outgoing_fifo_shipment_cur
     product_id: product_fifo_icecream
     product_uom: product.product_uom_kgm
-    product_qty: 49.5
-    type: out
+    product_uom_qty: 49.5
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+    picking_type_id: stock.picking_type_out
 - 
   I assign this outgoing shipment 
 - 
@@ -227,19 +216,19 @@
 - 
   Process the delivery of the outgoing shipment
 - 
-  !python {model: stock.partial.picking}: |
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [ref("outgoing_fifo_shipment_cur")], 'default_type':'out'})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    picking_obj = self.pool.get('stock.picking').browse(cr, uid, ref("outgoing_fifo_shipment_cur"))
+    picking_obj.do_partial(context=context)
 - 
-  Check rounded price is 102 euro
+  Check rounded price is 102 euro (because last outgoing shipment was made of 19.5kg at 80€ and 30kg at $150 (rate=1.2834)
 - 
   !python {model: product.product}: |
-    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == 102, "Price after doing other currency is wrong"
+    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == 102, "Product price not updated accordingly. %s found instead of 102 (rounded values)" %(round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price),)
 - 
   Do a delivery of an extra 10 kg
 - 
   !record {model: stock.picking, id: outgoing_fifo_shipment_ret}:
-    type: out
+    picking_type_id: stock.picking_type_out
 -
   Picking needs movement from stock
 -
@@ -247,8 +236,10 @@
     picking_id: outgoing_fifo_shipment_ret
     product_id: product_fifo_icecream
     product_uom: product.product_uom_kgm
-    product_qty: 10.0
-    type: out
+    product_uom_qty: 10.0
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+    picking_type_id: stock.picking_type_out
 - 
   I assign this outgoing shipment 
 - 
@@ -257,19 +248,19 @@
 - 
   Process the delivery of the outgoing shipment
 - 
-  !python {model: stock.partial.picking}: |
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [ref("outgoing_fifo_shipment_ret")], 'default_type':'out'})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    picking_obj = self.pool.get('stock.picking').browse(cr, uid, ref("outgoing_fifo_shipment_ret"))
+    picking_obj.do_partial(context=context)
 - 
   Check rounded price is 150.0 / 1.2834
 - 
   !python {model: product.product}: |
-    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == round(150.0 / 1.2834)
+    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == round(150.0 / 1.2834), "Product price not updated accordingly. %s found instead of %s" %(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price, round(150.0/1.2834))
 - 
   Let us create some outs to get negative stock. Create outpicking.  We create delivery order of 200 kg, but will pick only 100 kg
 - 
   !record {model: stock.picking, id: outgoing_fifo_shipment_neg}:
-    type: out
+    picking_type_id: stock.picking_type_out
 -
   Picking needs movement from stock
 -
@@ -277,13 +268,15 @@
     picking_id: outgoing_fifo_shipment_neg
     product_id: product_fifo_icecream
     product_uom: product.product_uom_kgm
-    product_qty: 200.0
-    type: out
+    product_uom_qty: 200.0
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+    picking_type_id: stock.picking_type_out
 - 
   Let us create another out of 400 kg, but will pick only 50 kg
 - 
   !record {model: stock.picking, id: outgoing_fifo_shipment_neg2}:
-    type: out
+    picking_type_id: stock.picking_type_out
 -
   Picking needs movement from stock
 -
@@ -291,20 +284,18 @@
     picking_id: outgoing_fifo_shipment_neg2
     product_id: product_fifo_icecream
     product_uom: product.product_uom_kgm
-    product_qty: 400.0
-    type: out
+    product_uom_qty: 400.0
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+    picking_type_id: stock.picking_type_out
 - 
   Process the delivery of the outgoing shipments
 - 
-  !python {model: stock.partial.picking}: |
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [ref("outgoing_fifo_shipment_neg")], 'default_type':'out'})
-    line = self.browse(cr, uid, partial_id, context=context).move_ids[0]
-    self.pool.get("stock.partial.picking.line").write(cr, uid, [line.id], {'quantity':100})
-    self.do_partial(cr, uid, [partial_id])
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [ref("outgoing_fifo_shipment_neg2")], 'default_type':'out'})
-    line = self.browse(cr, uid, partial_id, context=context).move_ids[0]
-    self.pool.get("stock.partial.picking.line").write(cr, uid, [line.id], {'quantity':50})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    picking_obj = self.browse(cr, uid, ref("outgoing_fifo_shipment_neg"))
+    picking_obj.do_partial(context=context)
+    picking_obj1 = self.browse(cr, uid, ref("outgoing_fifo_shipment_neg2"))
+    picking_obj1.do_partial(context=context)
 - 
   Receive purchase order with 50 kg FIFO Ice Cream at 50 euro/kg
 - 
@@ -325,15 +316,14 @@
 - 
   Process the reception of purchase order 1
 -
-  !python {model: stock.partial.picking}: |
-    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo_neg")).picking_ids
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    picking_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo_neg")).picking_ids[0]
+    picking_obj.do_partial(context=context)
 - 
   Assert price on product is still the old price as the out move has not been received fully yet
 - 
   !python {model: product.product}: |
-    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == round(150.0 / 1.2834)
+    assert round(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price) == round(150.0 / 1.2834), 'The product price should not have been updated'
 - 
   Receive purchase order with 60 kg FIFO Ice Cream at 80 euro/kg   
 - 
@@ -354,12 +344,11 @@
 - 
   Process the reception of purchase order 2
 -
-  !python {model: stock.partial.picking}: |
-    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo_neg2")).picking_ids
-    partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
-    self.do_partial(cr, uid, [partial_id])
+  !python {model: stock.picking}: |
+    picking_obj = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_fifo_neg2")).picking_ids[0]
+    picking_obj.do_partial(context=context)
 - 
   The price of the product should have changed back to 65.0 
 - 
   !python {model: product.product}: |
-    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 65.0
\ No newline at end of file
+    assert self.browse(cr, uid, ref("product_fifo_icecream")).standard_price == 65.0, "Product price not updated accordingly. %s found instead of 65" %(self.browse(cr, uid, ref("product_fifo_icecream")).standard_price,)
diff --git a/addons/purchase/test/process/run_scheduler.yml b/addons/purchase/test/process/run_scheduler.yml
index b8c4019ed1a..ff29a2a39f1 100644
--- a/addons/purchase/test/process/run_scheduler.yml
+++ b/addons/purchase/test/process/run_scheduler.yml
@@ -6,13 +6,8 @@
   !record {model: procurement.order, id: procurement_order_testcase0}:
     location_id: stock.stock_location_stock
     name: Test scheduler for RFQ
-    procure_method: make_to_order
     product_id: product.product_product_45
     product_qty: 15.0
--
-  I confirm on procurement order.
--
-  !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_testcase0}
 -
   I run the scheduler.
 -
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 85fda69a65e..6d08d163696 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -136,22 +136,13 @@ class purchase_requisition(osv.osv):
         return res
 
     def _prepare_purchase_order(self, cr, uid, requisition, supplier, context=None):
-        if not requisition.warehouse_id:
-            warehouse_obj = self.pool.get('stock.warehouse')
-
-            warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', requisition.company_id.id)], context=context)
-            if not warehouse_id:
-                raise osv.except_osv(_('Warning!'), _('No warehouse found for this company.'))
-            location_id = warehouse_obj.browse(cr, uid, warehouse_id, context=context)[0].lot_input_id.id
-        else:
-            location_id = requisition.warehouse_id.lot_input_id.id
         supplier_pricelist = supplier.property_product_pricelist_purchase and supplier.property_product_pricelist_purchase.id or False
         return {
             'origin': requisition.name,
             'date_order': requisition.date_end or fields.date.context_today(self, cr, uid, context=context),
             'partner_id': supplier.id,
             'pricelist_id': supplier_pricelist,
-            'location_id': location_id,
+            #'location_id': location_id,
             'company_id': requisition.company_id.id,
             'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
             'requisition_id': requisition.id,
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6535ed7bc6d..497b99ef1b8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1072,14 +1072,5 @@ class procurement_order(osv.osv):
     _inherit = 'procurement.order'
     _columns = {
         'sale_line_id': fields.many2one('sale.order.line', string='Sale Order Line'),
-        'invoice_state': fields.selection(
-          [
-            ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not Applicable")
-          ], "Invoice Control", required=True),
-    }
-    _defaults = {
-        'invoice_state': 'none',
     }
     
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 967350a88ac..ef6c19ad5a9 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -504,8 +504,7 @@
                 </xpath>
             </field>
         </record>
-        <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
-        <menuitem id="menu_invoicing_sales_order_lines" parent="base.menu_invoiced" action="action_order_line_tree2" sequence="10" groups="sale.group_invoice_so_lines"/>
+
 
         <record model="ir.ui.view" id="view_company_inherit_form2">
             <field name="name">res.company.form.inherit</field>
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 015347449ae..055b4309d6d 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -168,11 +168,12 @@ class sale_order(osv.osv):
     # if order_policy<>picking: super()
     # else: call invoice_on_picking_method()
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_invoice = False, context=None):
-        picking_obj = self.pool.get('stock.picking')
+        move_obj = self.pool.get("stock.move")
         res = super(sale_order,self).action_invoice_create(cr, uid, ids, grouped=grouped, states=states, date_invoice = date_invoice, context=context)
         for order in self.browse(cr, uid, ids, context=context):
             if order.order_policy == 'picking':
-                picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'})
+                for picking in order.picking_ids:
+                    move_obj.write(cr, uid, [x.id for x in picking.move_lines], {'invoice_state': 'invoiced'}, context=context)
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index b06f56d6659..9091787a7af 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -13,6 +13,7 @@
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
             <field name="search_view_id" ref="stock.view_picking_internal_search"/>
         </record>
+        <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
         <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale_stock.group_invoice_deli_orders" sequence="20"/>
 
     </data>
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index f903d160400..4251c7a98a8 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -58,7 +58,6 @@
       assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
       assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
       location_id = sale_order.warehouse_id.lot_stock_id.id
-      output_id = sale_order.warehouse_id.lot_output_id.id
       for move in picking.move_lines:
          order_line = move.procurement_id.sale_line_id
          date_planned = datetime.strptime(sale_order.date_order, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
@@ -72,7 +71,6 @@
          assert move.product_packaging.id == order_line.product_packaging.id,"Product packaging is not correspond."
          assert move.partner_id.id == order_line.address_allotment_id.id or sale_order.partner_shipping_id.id,"Address is not correspond"
          #assert move.location_id.id == location_id,"Source Location is not correspond."
-         #assert move.location_dest_id == output_id,"Destination Location is not correspond."
          assert move.price_unit == order_line.product_id.standard_price or 0.0,"Price Unit is not correspond"
 -
   Now, I dispatch delivery order.
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 57019053481..21cb3ced87d 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -91,7 +91,9 @@ Dashboard / Reports for Warehouse Management will include:
     'test': [
         'test/inventory.yml',
         'test/move.yml',
-#         'test/shipment.yml',
+        'test/procrule.yml',
+        'test/shipment.yml',
+        'test/packing.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 1563ee1416a..3b66c9aa206 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -208,6 +208,7 @@ class product_product(osv.osv):
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Serial Number for all moves containing this product and going to a Customer Location"),
         'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one'),
         'warehouse_id': fields.dummy(string='Warehouse', relation='stock.warehouse', type='many2one'),
+        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -258,6 +259,7 @@ class product_template(osv.osv):
     _name = 'product.template'
     _inherit = 'product.template'
     _columns = {
+        'type': fields.selection([('product', 'Stockable Product'), ('consu', 'Consumable'), ('service', 'Service')], 'Product Type', required=True, help="Consumable: Will not imply stock management for this product. \nStockable product: Will imply stock management for this product."),
         'property_stock_procurement': fields.property(
             type='many2one',
             relation='stock.location',
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 0f9e1e5943f..e8fa4d8da23 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -26,6 +26,11 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
+        'module_mrp_jit': fields.boolean("Generate procurement in real time",
+            help="""This allows Just In Time computation of procurement orders.
+                All procurement orders will be processed immediately, which could in some
+                cases entail a small performance impact.
+                This installs the module mrp_jit."""),
         'module_claim_from_delivery': fields.boolean("Allow claim on deliveries",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
@@ -62,8 +67,10 @@ This installs the module product_expiry."""),
         'group_stock_tracking_lot': fields.boolean("Track serial number on logistic units (pallets)",
             implied_group='stock.group_tracking_lot',
             help="""When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
+        'group_stock_tracking_owner': fields.boolean("Manage owner on stock", 
+            implied_group='stock.group_tracking_owner', 
+            help="""This way you can receive products attributed to a certain owner. """), 
         'module_stock_account': fields.boolean("Generate accounting entries per stock movement",
-            implied_group='stock.group_inventory_valuation',
             help="""Allows to configure inventory valuations on products and product categories."""),
         'group_stock_multiple_locations': fields.boolean("Manage multiple locations and warehouses",
             implied_group='stock.group_locations',
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f5015b146b5..471d1035ad1 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -38,6 +38,10 @@
                                 <field name="group_stock_tracking_lot" class="oe_inline"/>
                                 <label for="group_stock_tracking_lot"/>
                             </div>
+                            <div>
+                                <field name="group_stock_tracking_owner" class="oe_inline"/>
+                                <label for="group_stock_tracking_owner"/>
+                             </div>
                         </div>    
                     </group>
                     <separator string="Accounting"/>
@@ -58,6 +62,10 @@
                     <group>
                         <label for="id" string="Logistic"/>
                         <div>
+                            <div>
+                                <field name="module_mrp_jit" class="oe_inline"/>
+                                <label for="module_mrp_jit"/>
+                            </div>
                             <div>
                                 <field name="group_stock_multiple_locations" class="oe_inline"/>
                                 <label for="group_stock_multiple_locations"/>  
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 6df63f351e7..105c4a7b7ce 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -29,6 +29,11 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_tracking_owner" model="res.groups">
+        <field name="name">Manage Different Stock Owners</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
 </data>
 <data noupdate="1">
 <!-- multi -->
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7ece3c202dc..380df7844c7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -157,7 +157,7 @@ class stock_quant(osv.osv):
         'reservation_id': fields.many2one('stock.move', 'Reserved for Move', help="Is this quant reserved for a stock.move?"),
         'lot_id': fields.many2one('stock.production.lot', 'Lot'),
         'cost': fields.float('Unit Cost'),
-        'partner_id': fields.related('lot_id', 'partner_id', type='many2one', relation="res.partner", string="Owner", store=True),  # TODO implement store={}
+        'owner_id': fields.many2one('res.partner', 'Owner', help="This is the owner of the quant"),
 
         'create_date': fields.datetime('Creation Date'),
         'in_date': fields.datetime('Incoming Date'),
@@ -231,6 +231,7 @@ class stock_quant(osv.osv):
                 result += self._quants_get_lifo(cr, uid, location, product, qty, domain, prefered_order=prefered_order, context=context)
             else:
                 raise osv.except_osv(_('Error!'), _('Removal strategy %s not implemented.' % (removal_strategy,)))
+        print 'Quant get result', result
         return result
 
     #
@@ -241,7 +242,7 @@ class stock_quant(osv.osv):
     def _quant_create(self, cr, uid, qty, move, lot_id = False, context=None):
         # FP Note: TODO: compute the right price according to the move, with currency convert
         # QTY is normally already converted to main product's UoM
-        price_unit = move.price_unit
+        price_unit = self.pool.get('stock.move').get_price_unit(cr, uid, move, context=context)
         vals = {
             'product_id': move.product_id.id,
             'location_id': move.location_dest_id.id,
@@ -250,10 +251,9 @@ class stock_quant(osv.osv):
             'history_ids': [(4, move.id)],
             'in_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
             'company_id': move.company_id.id,
-            'lot_id': lot_id, 
+            'lot_id': lot_id,
         }
 
-        negative_quant_id = False
         if move.location_id.usage == 'internal':
             #if we were trying to move something from an internal location and reach here (quant creation),
             #it means that a negative quant has to be created as well.
@@ -262,9 +262,9 @@ class stock_quant(osv.osv):
             negative_vals['qty'] = -qty
             negative_vals['cost'] = price_unit
             negative_quant_id = self.create(cr, uid, negative_vals, context=context)
+            vals.update({'propagated_from_id': negative_quant_id})
 
         #create the quant
-        vals.update({'propagated_from_id': negative_quant_id})
         quant_id = self.create(cr, uid, vals, context=context)
         return self.browse(cr, uid, quant_id, context=context)
 
@@ -634,7 +634,9 @@ class stock_picking(osv.osv):
             })
             back_order_name = self.browse(cr, uid, backorder_id, context=context).name
             self.message_post(cr, uid, picking.id, body=_("Back order <em>%s</em> <b>created</b>.") % (back_order_name), context=context)
-            self.pool.get('stock.move').write(cr, uid, backorder_move_ids, {'picking_id': backorder_id}, context=context)
+            move_obj = self.pool.get("stock.move")
+            move_obj.write(cr, uid, backorder_move_ids, {'picking_id': backorder_id}, context=context)
+            self.pool.get("stock.picking").action_confirm(cr, uid, [picking.id], context=context)
             return backorder_id
         return False
 
@@ -653,9 +655,11 @@ class stock_picking(osv.osv):
                         'product_qty': qty,
                         'quant_id': quant.id,
                         'product_id': quant.product_id.id,
-                        'lot_id': quant.lot_id.id,
+                        'lot_id': quant.lot_id and quant.lot_id.id or False,
                         'product_uom_id': quant.product_id.uom_id.id,
+                        'owner_id': quant.owner_id and quant.owner_id.id or False,
                         'cost': quant.cost,
+                        'package_id': quant.package_id and quant.package_id.id or False,
                     }, context=context)
                 if remaining_qty > 0:
                     pack_operation_obj.create(cr, uid, {
@@ -725,7 +729,13 @@ class stock_picking(osv.osv):
             for move in picking.move_lines:
                 quant_obj.quants_unreserve(cr, uid, move, context=context)
                 res2[move.id] = move.product_qty
-            for ops in picking.pack_operation_ids:
+            # Resort pack_operation_ids
+            
+            orderedpackops = picking.pack_operation_ids
+            #Sort packing operations such that packing operations with most specific information 
+            orderedpackops.sort(key = lambda x: (x.package_id and -1 or 0) + (x.lot_id and -1 or 0))
+
+            for ops in orderedpackops:
                 #Find moves that correspond
                 if ops.product_id:
                     #TODO: Should have order such that things with lots and packings are searched first
@@ -740,7 +750,7 @@ class stock_picking(osv.osv):
                             qty = move.remaining_qty
                             qty_to_do -= move.remaining_qty
                         
-                        if create and move.location_id != 'internal':
+                        if create and move.location_id.usage != 'internal':
                             # Create quants
                             vals = {
                                 'product_id': move.product_id.id,
@@ -750,17 +760,21 @@ class stock_picking(osv.osv):
                                 'history_ids': [(4, move.id)],
                                 'in_date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
                                 'company_id': move.company_id.id,
-                                'lot_id': ops.lot_id and ops.lot_id.id or False, 
+                                'lot_id': ops.lot_id and ops.lot_id.id or False,
+                                'owner_id': ops.owner_id and ops.owner_id.id or False,
                                 'reservation_id': move.id, #Reserve at once
                                 'package_id': ops.result_package_id and ops.result_package_id.id or False, 
                             }
                             quant_id = quant_obj.create(cr, uid, vals, context=context)
                         else:
                             #Quants get
-                            domain = [('reservation_id', '=', False)]
-                            prefered_order = op_obj._get_preferred_order(cr, uid, ops.id, context=context)
+                            prefered_order = "reservation_id IS NOT NULL"
+                            domain = op_obj._get_domain(cr, uid, ops, context=context)
                             quants = quant_obj.quants_get(cr, uid, move.location_id, move.product_id, qty, domain=domain, prefered_order=prefered_order, context=context)
                             quant_obj.quants_reserve(cr, uid, quants, move, context=context)
+                            #In the end, move quants in correct package
+                            if create:
+                                quant_obj.write(cr, uid, [x[0].id for x in quants], {'package_id': ops.result_package_id and ops.result_package_id.id or False}, context=context)
                         res2[move.id] -= qty
                     res[ops.id] = {}
                     res[ops.id][ops.product_id.id] = qty_to_do
@@ -777,10 +791,13 @@ class stock_picking(osv.osv):
                             else:
                                 qty = move.remaining_qty
                                 qty_to_do -= move.remaining_qty
-                            quant_obj.quants_reserve(cr, uid, [(quant.id, qty)], move, context=context)
+                            quant_obj.quants_reserve(cr, uid, [(quant, qty)], move, context=context)
                             res2[move.id] -= qty
                         res.setdefault(ops.id, {}).setdefault(quant.product_id.id, 0.0)
                         res[ops.id][quant.product_id.id] += qty_to_do
+                    #Add parent package
+                    if create:
+                        self.pool.get("stock.quant.package").write(cr, uid, [ops.package_id.id], {'parent_id': ops.result_package_id and ops.result_package_id.id or False}, context=context)
         return (res, res2)
 
 
@@ -823,8 +840,7 @@ class stock_picking(osv.osv):
                 for move in res2.keys():
                     if res2[move] > 0:
                         mov = stock_move_obj.browse(cr, uid, move, context=context)
-                        newmove_id = stock_move_obj.split(cr, uid, mov, res2[move], context=context)
-
+                        stock_move_obj.split(cr, uid, mov, res2[move], context=context)
                 stock_move_obj.action_done(cr, uid, extra_moves + [x.id for x in orig_moves], context=context)
             picking.refresh()
             self._create_backorder(cr, uid, picking, context=context)
@@ -832,7 +848,7 @@ class stock_picking(osv.osv):
 
     def do_split(self, cr, uid, picking_ids, context=None):
         """
-            just spit the picking without making it 'done'
+            just split the picking without making it 'done'
         """
         if context is None:
             context = {}
@@ -929,7 +945,7 @@ class stock_production_lot(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'quant_ids': fields.one2many('stock.quant', 'lot_id', 'Quants'),
         'create_date': fields.datetime('Creation Date'),
-        'partner_id': fields.many2one('res.partner', 'Owner'),
+#         'partner_id': fields.many2one('res.partner', 'Owner'),
     }
     _defaults = {
         'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'stock.lot.serial'),
@@ -942,8 +958,8 @@ class stock_production_lot(osv.osv):
         res = []
         for lot in self.browse(cr, uid, ids, context=context):
             name = lot.name
-            if lot.partner_id:
-                name += ' (' + lot.partner_id.name + ')'
+#             if lot.partner_id:
+#                 name += ' (' + lot.partner_id.name + ')'
             res.append((lot.id, name))
         return res
 
@@ -959,6 +975,10 @@ class stock_move(osv.osv):
     _order = 'date_expected desc, id'
     _log_create = False
 
+    def get_price_unit(self, cr, uid, move, context=None):
+        """ Returns the unit price to store on the move """
+        return move.price_unit or move.product_id.standard_price
+
     def name_get(self, cr, uid, ids, context=None):
         res = []
         for line in self.browse(cr, uid, ids, context=context):
@@ -1013,7 +1033,7 @@ class stock_move(osv.osv):
     def _get_remaining_qty(self, cr, uid, ids, field_name, args, context=None):
         res = {}
         for move in self.browse(cr, uid, ids, context=context):
-            res[move.id] = move.product_uom_qty
+            res[move.id] = move.product_qty
             for quant in move.reserved_quant_ids:
                 res[move.id] -= quant.qty
         return res
@@ -1130,7 +1150,10 @@ class stock_move(osv.osv):
         'origin_returned_move_id': fields.many2one('stock.move', 'Origin return move', help='move that created the return move'),
         'returned_move_ids': fields.one2many('stock.move', 'origin_returned_move_id', 'All returned moves', help='Optional: all returned moves created from this move'),
         'availability': fields.function(_get_product_availability, type='float', string='Availability'),
-    }
+        }
+    
+    
+
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -1478,20 +1501,19 @@ class stock_move(osv.osv):
         for move in self.browse(cr, uid, ids, context=context):
             if move.picking_id:
                 pickings.add(move.picking_id.id)
-            qty = move.product_uom_qty
+            qty = move.product_qty
 
             # for qty, location_id in move_id.prefered_location_ids:
             #    quants = quant_obj.quants_get(cr, uid, move.location_id, move.product_id, qty, context=context)
             #    quant_obj.quants_move(cr, uid, quants, move, location_dest_id, context=context)
             # should replace the above 2 lines
             domain = ['|', ('reservation_id', '=', False), ('reservation_id', '=', move.id)]
-            prefered_order = 'reservation_id<>' + str(move.id)
+            prefered_order = 'reservation_id'
 #             if lot_id: 
 #                 prefered_order = 'lot_id<>' + lot_id + ", " + prefered_order
 #             if pack_id: 
 #                 prefered_order = 'pack_id<>' + pack_id + ", " + prefered_order
             quants = quant_obj.quants_get(cr, uid, move.location_id, move.product_id, qty, domain=domain, prefered_order = prefered_order, context=context)
-            
             #Will move all quants_get and as such create negative quants
             quant_obj.quants_move(cr, uid, quants, move, context=context)
             quant_obj.quants_unreserve(cr, uid, move, context=context)
@@ -1617,10 +1639,11 @@ class stock_move(osv.osv):
         self.action_done(cr, uid, res, context=context)
         return res
 
+
+
     def split(self, cr, uid, move, qty, context=None):
         """ 
             Splits qty from move move into a new move
-            It will check if it can propagate the split
         """
         if move.product_qty==qty:
             return move.id
@@ -1651,7 +1674,7 @@ class stock_move(osv.osv):
         }, context=context)
         
         if move.move_dest_id and move.propagate:
-            self.split(self, cr, uid, move.move_dest_id, qty, context=context)
+            self.split(cr, uid, move.move_dest_id, qty, context=context)
         return new_move
 
 class stock_inventory(osv.osv):
@@ -1721,6 +1744,7 @@ class stock_inventory(osv.osv):
         for inv in self.browse(cr, uid, ids, context=context):
             if not inv.move_ids:
                 self.action_check(cr, uid, [inv.id], context=context)
+            inv.refresh()
             move_obj.action_done(cr, uid, [x.id for x in inv.move_ids], context=context)
             self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
         return True
@@ -1898,25 +1922,17 @@ class stock_warehouse(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
-        'partner_id': fields.many2one('res.partner', 'Owner Address'),
-        'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True, domain=[('usage', '<>', 'view')]),
+        'partner_id': fields.many2one('res.partner', 'Address'),
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage', '=', 'internal')]),
-        'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage', '<>', 'view')]),
     }
 
-    def _default_lot_input_stock_id(self, cr, uid, context=None):
+    def _default_stock_id(self, cr, uid, context=None):
         lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
         return lot_input_stock.id
 
-    def _default_lot_output_id(self, cr, uid, context=None):
-        lot_output = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_output')
-        return lot_output.id
-
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c),
-        'lot_input_id': _default_lot_input_stock_id,
-        'lot_stock_id': _default_lot_input_stock_id,
-        'lot_output_id': _default_lot_output_id,
+        'lot_stock_id': _default_stock_id,
     }
 
 
@@ -2076,6 +2092,7 @@ class stock_pack_operation(osv.osv):
         'lot_id': fields.many2one('stock.production.lot', 'Lot/Serial Number'), 
         'result_package_id': fields.many2one('stock.quant.package', 'Container Package', help="If set, the operations are packed into this package", required=False, ondelete='cascade'),
         'date': fields.datetime('Date', required=True),
+        'owner_id': fields.many2one('res.partner', 'Owner', help="Owner of the quants"),
         #'update_cost': fields.boolean('Need cost update'),
         'cost': fields.float("Cost", help="Unit Cost for this product line"),
         'currency': fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", ondelete='CASCADE'),
@@ -2085,18 +2102,21 @@ class stock_pack_operation(osv.osv):
         'date': fields.date.context_today,
     }
 
-    def _get_preferred_order(self, cr, uid, id, context=None):
-        ops = self.browse(cr, uid, id, context=context)
-        res = ""
-        if ops.package_id:
-            res += "package_id <> " + str(ops.package_id.id)
-        if ops.lot_id:
-            if res:
-                res += ", lot_id <> " + str(ops.lot_id.id)
-            else:
-                res += "lot_id <> " + str(ops.lot_id.id)
-        return res
 
+    def _get_domain(self, cr, uid, ops, context=None):
+        '''
+            Gives domain for different 
+        '''
+        res = []
+        if ops.package_id:
+            res.append(('package_id', '=', ops.package_id.id), )
+        if ops.lot_id:
+            res.append(('lot_id', '=', ops.lot_id.id), )
+        if ops.owner_id: 
+            res.append(('owner_id', '=', ops.owner_id.id), )
+        else:
+            res.append(('owner_id', '=', False), )
+        return res
 
     #TODO: this function can be refactored
     def _search_and_increment(self, cr, uid, picking_id, key, context=None):
@@ -2253,26 +2273,12 @@ class stock_warehouse_orderpoint(osv.osv):
 class product_template(osv.osv):
     _inherit = "product.template"
     _columns = {
-        'type': fields.selection([('product', 'Stockable Product'), ('consu', 'Consumable'), ('service', 'Service')], 'Product Type', required=True, help="Consumable: Will not imply stock management for this product. \nStockable product: Will imply stock management for this product."),
         'supply_method': fields.selection([('produce', 'Manufacture'), ('buy', 'Buy'), ('wait', 'None')], 'Supply Method', required=True, help="Manufacture: When procuring the product, a manufacturing order or a task will be generated, depending on the product type. \nBuy: When procuring the product, a purchase order will be generated."),
     }
     _defaults = {
         'supply_method': 'buy',
     }
 
-class product_product(osv.osv):
-    _inherit = "product.product"
-    _columns = {
-        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
-    }
-
-class stock_picking_code(osv.osv):
-    _name = "stock.picking.code"
-    _description = "Will group picking types for kanban view"
-    _columns = {
-        'name': fields.char("Picking Type", translate=True),
-    }
-
 class stock_picking_type(osv.osv):
     _name = "stock.picking.type"
     _description = "The picking type determines the picking view"
@@ -2364,17 +2370,58 @@ class stock_picking_type(osv.osv):
                 result[type_id]['latest_picking_waiting'] = cmp(pick.date[:10], time.strftime('%Y-%m-%d'))
         return result
 
+    def onchange_picking_code(self, cr, uid, ids, picking_code=False):
+        if not picking_code:
+            return False
+        
+        obj_data = self.pool.get('ir.model.data')
+        stock_loc = obj_data.get_object_reference(cr, uid, 'stock','stock_location_stock')[1]
+        
+        result = {
+            'default_location_src_id': stock_loc,
+            'default_location_dest_id': stock_loc,
+        }
+        if picking_code == 'incoming':
+            result['default_location_src_id'] = obj_data.get_object_reference(cr, uid, 'stock','stock_location_suppliers')[1]
+            return {'value': result}
+        if picking_code == 'outgoing':
+            result['default_location_dest_id'] = obj_data.get_object_reference(cr, uid, 'stock','stock_location_customers')[1]
+            return {'value': result}
+        else:
+            return {'value': result}
+
+    def name_get(self, cr, uid, ids, context=None):
+        """Overides orm name_get method to display 'Warehouse_name: PickingType_name' """
+        if not isinstance(ids, list):
+            ids = [ids]
+        res = []
+        if not ids:
+            return res
+        reads = self.browse(cr, uid, ids, context=context)
+        for record in reads:
+            name = record.name
+            if record.warehouse_id:
+                name = record.warehouse_id.name+': '+name
+            res.append((record.id, name))
+        return res
+
+    def _default_warehouse(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', user.company_id.id)], limit=1, context=context)
+        return res and res[0] or False
+
     _columns = {
         'name': fields.char('name', translate=True, required=True),
-        'pack': fields.boolean('Pack', help='This picking type needs packing interface'),
+        'pack': fields.boolean('Prefill Pack Operations', help='This picking type needs packing interface'),
         'auto_force_assign': fields.boolean('Automatic Availability', help='This picking type does\'t need to check for the availability in stock'),
         'color': fields.integer('Color Index'),
         'delivery': fields.boolean('Print delivery'),
         'sequence_id': fields.many2one('ir.sequence', 'Sequence', required=True),
         'default_location_src_id': fields.many2one('stock.location', 'Default Source Location'),
         'default_location_dest_id': fields.many2one('stock.location', 'Default Destination Location'),
-        'code_id': fields.many2one('stock.picking.code', 'Picking type code', required=True),
+        'code_id': fields.selection([('incoming', 'Suppliers'), ('outgoing', 'Customers'), ('internal', 'Internal')], 'Picking type code', required=True),
         'return_picking_type_id': fields.many2one('stock.picking.type', 'Picking Type for Returns'),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
 
         # Statistics for the kanban view
         'weekly_picking': fields.function(_get_picking_data,
@@ -2403,4 +2450,7 @@ class stock_picking_type(osv.osv):
             type='string', multi='_get_picking_history'),
 
     }
+    _defaults = {
+        'warehouse_id': _default_warehouse,
+    }
 
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index ff56e44548f..b591263f4b2 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -77,12 +77,6 @@
             <field name="location_id" ref="stock_location_company"/>
         </record>
 
-        
-        
-        
-                <!--
-            Picking types, sequences and codes
-         -->
 
         <!-- Sequences for picking types   -->
         <record id="seq_picking_type_in" model="ir.sequence">
@@ -106,24 +100,12 @@
             <field name="company_id" eval="False"/>
         </record>
         
-        <record id="picking_code_in" model="stock.picking.code">
-            <field name="name">Suppliers</field>
-        </record>
-        
-        <record id="picking_code_out" model="stock.picking.code">
-            <field name="name">Customers</field>
-        </record>
-        
-        <record id="picking_code_internal" model="stock.picking.code">
-            <field name="name">Internal</field>
-        </record>
-        
         <record id="picking_type_in" model="stock.picking.type">
             <field name="name">Receptions</field>
             <field name="sequence_id" ref="seq_picking_type_in"/>
             <field name="default_location_src_id" ref="stock_location_suppliers"/>
             <field name="default_location_dest_id" ref="stock_location_stock"/>
-            <field name="code_id" ref="picking_code_in"/>
+            <field name="code_id">incoming</field>
             <field name="auto_force_assign">True</field>
         </record>
         
@@ -132,13 +114,13 @@
             <field name="sequence_id" ref="seq_picking_type_out"/>
             <field name="default_location_src_id" ref="stock_location_stock"/>
             <field name="default_location_dest_id" ref="stock_location_customers"/>
-            <field name="code_id" ref="picking_code_out"/>
+            <field name="code_id">outgoing</field>
         </record>
         
         <record id="picking_type_internal" model="stock.picking.type">
             <field name="name">Internal Transfers</field>
             <field name="sequence_id" ref="seq_picking_type_internal"/>
-            <field name="code_id" ref="picking_code_internal"/>
+            <field name="code_id">internal</field>
         </record>
         
         
@@ -228,9 +210,7 @@ watch your stock valuation, and track production lots upstream and downstream (b
     -->
         <record id="warehouse0" model="stock.warehouse">
             <field model="res.company" name="name" search="[]" use="name"/>
-            <field name="lot_input_id" ref="stock_location_stock"/>
             <field name="lot_stock_id" ref="stock_location_stock"/>
-            <field name="lot_output_id" ref="stock_location_output"/>
         </record>
 
         <record id="sequence_mrp_op_type" model="ir.sequence.type">
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 7d1515c427f..c42e216f636 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -251,20 +251,16 @@
         </record>
 
         <record id="stock_warehouse_shop0" model="stock.warehouse">
-            <field name="lot_output_id" ref="stock.stock_location_output"/>
             <field name="name">Chicago Warehouse</field>
             <field name="lot_stock_id" ref="stock_location_shop0"/>
             <field name="partner_id" ref="res_partner_address_41"/>
             <field name="company_id" ref="res_company_1"/>
-            <field name="lot_input_id" ref="stock_location_shop0"/>
         </record>
         <record id="stock_warehouse_shop1" model="stock.warehouse">
-            <field name="lot_output_id" ref="stock.stock_location_output"/>
             <field name="name">Birmingham Warehouse</field>
             <field name="lot_stock_id" ref="stock_location_shop1"/>
             <field name="partner_id" ref="res_partner_address_40"/>
             <field name="company_id" ref="res_company_1"/>
-            <field name="lot_input_id" ref="stock_location_shop1"/>
         </record>
 
     </data>
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index cf8d1f71572..07763ee8cc1 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -22,9 +22,7 @@
 -
  !record {model: stock.warehouse, id: warehouse_icecream}:
     name: Ice Cream Shop
-    lot_input_id: location_refrigerator
     lot_stock_id: location_refrigerator
-    lot_output_id: location_delivery_counter
 -
  !record {model: product.product, id: product_icecream}:
     default_code: 001
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 30038952ce7..0eca4f6f65b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -498,9 +498,7 @@
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
-                            <field name="lot_input_id" groups="stock.group_locations"/>
                             <field name="lot_stock_id" groups="stock.group_locations"/>
-                            <field name="lot_output_id" groups="stock.group_locations"/>
                         </group>
                         <group>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -517,9 +515,7 @@
             <field name="arch" type="xml">
                 <tree string="Warehouse">
                     <field name="name"/>
-                    <field name="lot_input_id" groups="stock.group_locations"/>
                     <field name="lot_stock_id" groups="stock.group_locations"/>
-                    <field name="lot_output_id" groups="stock.group_locations"/>
                     <field name="partner_id"/>
                 </tree>
             </field>
@@ -614,11 +610,12 @@
                             <field name="pack_operation_ids" attrs="{'invisible': [('pack_operation_exist', '=', False)]}">
                                 <tree editable="top">
                                     <field name="product_id"/>
-                                    <field name="product_uom_id"/>
-                                    <field name="lot_id"/>
-                                    <field name="package_id"/>
+                                    <field name="product_uom_id" groups="product.group_uom"/>
+                                    <field name="lot_id" groups="stock.group_production_lot"/>
+                                    <field name="package_id" groups="stock.group_tracking_lot"/>
+                                    <field name="owner_id" groups="stock.group_tracking_owner"/>
                                     <field name="product_qty"/>
-                                    <field name="result_package_id"/>
+                                    <field name="result_package_id" groups="stock.group_tracking_lot"/>
                                 </tree>
                             </field>
                             <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'default_picking_type_id': picking_type_id}"/>
@@ -1185,6 +1182,7 @@
                 <search string="Picking Type">
                     <field name="name" string="Picking Type"/>
                     <field name="sequence_id"/>
+                    <field name="warehouse_id"/>
                 </search>
             </field>
         </record>
@@ -1204,18 +1202,27 @@
             <field name="model">stock.picking.type</field>
             <field name="arch" type="xml">
                 <form string="Picking Types" version="7.0">
-                    <group>
-                        <field name="name"/>
-                        <field name="code_id"/>
-                        <field name="sequence_id"/>
-                        <field name="pack"/>
-                        <field name="auto_force_assign"/>
-                    </group>
-                    <group>
-                        <field name="default_location_src_id"/>
-                        <field name="default_location_dest_id"/>
-                        <field name="return_picking_type_id"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="sequence_id"/>
+                                <field name="warehouse_id"/>
+                                <field name="pack"/>
+                            </group>
+                            <group>
+                                <field name="code_id" on_change="onchange_picking_code(code_id)"/>
+                                <field name="return_picking_type_id"/>
+                                <field name="auto_force_assign"/>
+                                <field name="delivery"/>
+                            </group>
+                        </group>
+                        <separator string="Locations"/>
+                        <group>
+                            <field name="default_location_src_id" attrs="{'required': [('code_id', '=', 'internal')]}"/>
+                            <field name="default_location_dest_id" attrs="{'required': [('code_id', 'in', ('internal', 'incoming'))]}"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1544,6 +1551,7 @@
                     <field name="reservation_id"/>
                     <field name="propagated_from_id"/>
                     <field name="history_ids"/>
+                    <field name="owner_id"/>
                 </form>
             </field>
         </record>
@@ -1559,7 +1567,7 @@
                     <field name="qty"/>
                     <field name="location_id"/>
                     <field name="lot_id"/>
-                    <field name="package_id" invisible="1"/>
+                    <field name="package_id"/>
                     <field name="packaging_type_id" invisible="1"/>
                     <field name="in_date"/>
                     <field name="reservation_id" invisible='1'/>
@@ -1654,7 +1662,7 @@
                         <field name="loc_case"/>
                     </group>
                 </group>
-                <group name="Weights" position="after">
+                <group name="Weights" position="before">
                      <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
                          <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                          <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/test/inventory.yml b/addons/stock/test/inventory.yml
index 3a9d4a4c5db..b687aded288 100644
--- a/addons/stock/test/inventory.yml
+++ b/addons/stock/test/inventory.yml
@@ -1,83 +1,106 @@
 -
-  I create an inventory of 10 products
+  In order to test the inventory, I create a new product
+-
+    !record {model: product.product, id: inventory_product}:
+         name: inventory prod
+         type: product
+-
+  I create an inventory for this product only
 -
   !record {model: stock.inventory, id: inventory_test0}:
     name: Test
-    inventory_line_id:
-      - product_id: product.product_product_3
-        product_qty: 10
-        location_id: stock.stock_location_14
+    product_id: inventory_product
+
 -
-  I post this inventory
+  I create the wizard to confirm the inventory
+-
+  !record {model: stock.fill.inventory, id: inventory_test0_wizard}:
+    set_stock_zero: False
+-
+  I fill this inventory
+-
+  !python {model: stock.inventory.line}: |
+    context = {'active_ids': [ref('inventory_test0')]}
+    self.pool.get('stock.fill.inventory').fill_inventory(cr, uid, [ref('inventory_test0_wizard')], context=context)
+-
+  I check that my inventory has no line, as the product is a new one.
+-
+  !python {model: stock.inventory}: |
+    inv = self.browse(cr, uid, ref('inventory_test0'), context=context)
+    assert len(inv.line_ids) == 0, "Wrong number of inventory lines."
+-
+  I add an inventory line and say i have 10 products in stock
+-
+  !record {model: stock.inventory.line, id: inventory_testline0}:
+    inventory_id: stock.inventory_test0
+    product_id: inventory_product
+    product_qty: 10
+    location_id: stock.stock_location_14
+-
+  I confirm this inventory
 -
   !python {model: stock.inventory}: |
-    self.action_confirm(cr, uid, [ref('inventory_test0')], context=context)
     self.action_done(cr, uid, [ref('inventory_test0')], context=context)
 -
   I check that this inventory has a stock.move and a quant
 -
   !python {model: stock.inventory}: |
     inv = self.browse(cr, uid, ref('inventory_test0'), context=context)
-    assert len(inv.move_ids) == 1, "No move created for the inventory."
+    assert len(inv.move_ids) >= 1, "No move created for the inventory."
     assert len(inv.move_ids[0].quant_ids) >= 1, "No quant created for this inventory"
 -
-  I check that the quantity on hand is 10 on the location and it's parent.
+  I check that the quantity on hand is 10 on the location and its parent.
 -
   !python {model: product.product}: |
     context['location'] = ref('stock.stock_location_14')
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==10, 'Expecting 10 products, got %.2f on location stock_location_14!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('inventory_product'), context=context)
+    assert product.qty_available == 10, 'Expecting 10 products, got %.2f on location stock_location_14!' % (product.qty_available,)
     context['location'] = ref('stock.stock_location_stock')
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==10, 'Expecting 10 products, got %.2f on location stock_location_stock!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('inventory_product'), context=context)
+    assert product.qty_available == 10, 'Expecting 10 products, got %.2f on location stock_location_stock!' % (product.qty_available,)
 -
   I check that the quantity on hand is 0 on a brother location
 -
   !python {model: product.product}: |
     context['location'] = ref('stock.stock_location_components')
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==0, 'Expecting 0 products, got %.2f on location stock_location_components!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('inventory_product'), context=context)
+    assert product.qty_available == 0, 'Expecting 0 products, got %.2f on location stock_location_components!' % (product.qty_available,)
 -
-  I create an inventory of 20 products
+  I create another inventory
 -
   !record {model: stock.inventory, id: inventory_test1}:
-    name: Test
-    inventory_line_id:
-      - product_id: product.product_product_3
-        product_qty: 20
-        location_id: stock.stock_location_14
+    name: second test inventory 
+    product_id: inventory_product
 -
-  I post this new inventory
+  I fill this new inventory
+-
+  !python {model: stock.inventory}: |
+    context = {'active_ids': [ref('inventory_test1')]}
+    self.pool.get('stock.fill.inventory').fill_inventory(cr, uid, [ref('inventory_test0_wizard')], context=context)
+-
+  I check that my inventory has one line, with a quantity of 10.
+-
+  !python {model: stock.inventory}: |
+    inv = self.browse(cr, uid, ref('inventory_test1'), context=context)
+    assert inv.line_ids and len(inv.line_ids) == 1, "Wrong number of inventory lines."
+    assert inv.line_ids[0].product_qty == 10, "Wrong quantity in inventory line."
+    assert inv.line_ids[0].product_id.id == ref('inventory_product'), "Wrong product in inventory line."
+-
+  I modify the inventory line and set the quantity to 20 product on this new inventory
+-
+  !python {model: stock.inventory}: |
+    inv = self.browse(cr, uid, ref('inventory_test1'), context=context)
+    self.pool.get('stock.inventory.line').write(cr, uid, inv.line_ids[0].id, {'product_qty': 20})
+-
+  I confirm this inventory
 -
   !python {model: stock.inventory}: |
-    self.action_confirm(cr, uid, [ref('inventory_test1')], context=context)
     self.action_done(cr, uid, [ref('inventory_test1')], context=context)
-
 -
-  I check that the quantity on hand is 20 on the location and it's parent.
+  I check that the quantity on hand is 20 on the location and its parent.
 -
   !python {model: product.product}: |
     context['location'] = ref('stock.stock_location_14')
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==20, 'Expecting 20 products, got %.2f on location stock_location_14!' % (product.qty_available,)
--
-  !record {model: stock.inventory, id: inventory_test2}:
-    name: Test
-    inventory_line_id:
-      - product_id: product.product_product_3
-        product_qty: 18
-        location_id: stock.stock_location_14
--
-  I post this new inventory
--
-  !python {model: stock.inventory}: |
-    self.action_confirm(cr, uid, [ref('inventory_test2')], context=context)
-    self.action_done(cr, uid, [ref('inventory_test2')], context=context)
--
-  I check that the quantity on hand is 18 on the location and it's parent.
--
-  !python {model: product.product}: |
-    context['location'] = ref('stock.stock_location_14')
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==18, 'Expecting 18 products, got %.2f on location stock_location_14!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('inventory_product'), context=context)
+    assert product.qty_available == 20, 'Expecting 20 products, got %.2f on location stock_location_14!' % (product.qty_available,)
 
diff --git a/addons/stock/test/move.yml b/addons/stock/test/move.yml
index 696ef6f8976..f2fceb4a2b6 100644
--- a/addons/stock/test/move.yml
+++ b/addons/stock/test/move.yml
@@ -1,9 +1,15 @@
 -
-  I create a move of 5 products from stock to customer
+  I first create a new product
+-
+    !record {model: product.product, id: move_product}:
+         name: move prod
+         type: product
+-
+  In order to test the negative quants, I create a move of 5 products from stock to customer
 -
   !record {model: stock.move, id: move_test0}:
     name: Move Products
-    product_id: product.product_product_3
+    product_id: move_product
     product_uom_qty: 5
     product_uom: product.product_uom_unit
     product_uos_qty: 5
@@ -16,63 +22,38 @@
   !python {model: stock.move}: |
     self.action_confirm(cr, uid, [ref('move_test0')], context=context)
 -
-  I check that the quantity on hand is 18 and virtual is 13
+  I check that the quantity on hand is 0 and virtual is -5
 -
   !python {model: product.product}: |
     context['location'] = False
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==18, 'Expecting 18 products in stock, got %.2f!' % (product.qty_available,)
-    assert product.virtual_available==13.0, 'Expecting 13 products in virtual stock, got %.2f!' % (product.virtual_available,)
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == 0, 'Expecting 0 products in stock, got %.2f!' % (product.qty_available,)
+    assert product.virtual_available == -5.0, 'Expecting -5 products in virtual stock, got %.2f!' % (product.virtual_available,)
 -
   I validate the move
 -
   !python {model: stock.move}: |
     self.action_done(cr, uid, [ref('move_test0')], context=context)
 -
-  I check that the quantity on hand is 13 and 5 products are at customer location
+  I check that the quantity on hand is -5 and 5 products are at customer location
 -
   !python {model: product.product}: |
     context['location'] = False
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==13, 'Expecting 13 products in stock, got %.2f!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == -5, 'Expecting -5 products in stock, got %.2f!' % (product.qty_available,)
 
     context['location'] = ref('stock.stock_location_customers')
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available==5, 'Expecting 5 products in customer location, got %.2f!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == 5, 'Expecting 5 products in customer location, got %.2f!' % (product.qty_available,)
 -
-  In order to test negative quants, I will deliver 14 products to the customer
--
-  !record {model: stock.move, id: move_test1}:
-    name: Move 14 Products
-    product_id: product.product_product_3
-    product_uom_qty: 14
-    product_uom: product.product_uom_unit
-    product_uos_qty: 14
-    product_uos: product.product_uom_unit
-    location_id: stock.stock_location_stock
-    location_dest_id: stock.stock_location_customers
--
-  I confirm and validate the move
--
-  !python {model: stock.move}: |
-    self.action_confirm(cr, uid, [ref('move_test1')], context=context)
-    self.action_done(cr, uid, [ref('move_test1')], context=context)
--
-  I check that the quantity on hand is -2
--
-  !python {model: product.product}: |
-    context['location'] = False
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available == -1, 'Expecting -1 products in stock, got %.2f!' % (product.qty_available,)
--
-  To compensate negative quants, I will receive 5 products from the supplier
+  To compensate negative quants, I will receive 15 products from the supplier
 -
   !record {model: stock.move, id: move_test2}:
     name: Move 15 Products
-    product_id: product.product_product_3
-    product_uom_qty: 5
+    product_id: move_product
+    product_uom_qty: 15
     product_uom: product.product_uom_unit
-    product_uos_qty: 5
+    product_uos_qty: 15
     product_uos: product.product_uom_unit
     location_id: stock.stock_location_suppliers
     location_dest_id: stock.stock_location_stock
@@ -83,9 +64,51 @@
     self.action_confirm(cr, uid, [ref('move_test2')], context=context)
     self.action_done(cr, uid, [ref('move_test2')], context=context)
 -
-  I check that the quantity on hand is 4
+  I check that the quantity on hand is 10
 -
   !python {model: product.product}: |
     context['location'] = False
-    product = self.browse(cr, uid, ref('product.product_product_3'), context=context)
-    assert product.qty_available == 4, 'Expecting 4 products in stock, got %.2f!' % (product.qty_available,)
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == 10, 'Expecting 10 products in stock, got %.2f!' % (product.qty_available,)
+    assert product.virtual_available == 10.0, 'Expecting 10 products in virtual stock, got %.2f!' % (product.virtual_available,)
+-
+  I create a move of 2 products from stock to customer
+-
+  !record {model: stock.move, id: move_test1}:
+    name: Move Products
+    product_id: move_product
+    product_uom_qty: 2
+    product_uom: product.product_uom_unit
+    product_uos_qty: 2
+    product_uos: product.product_uom_unit
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.stock_location_customers
+-
+  I confirm the move to be processed in the future
+-
+  !python {model: stock.move}: |
+    self.action_confirm(cr, uid, [ref('move_test1')], context=context)
+-
+  I check that the quantity on hand is 10 and virtual is 8
+-
+  !python {model: product.product}: |
+    context['location'] = False
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == 10, 'Expecting 10 products in stock, got %.2f!' % (product.qty_available,)
+    assert product.virtual_available == 8.0, 'Expecting 8 products in virtual stock, got %.2f!' % (product.virtual_available,)
+-
+  I validate the move
+-
+  !python {model: stock.move}: |
+    self.action_done(cr, uid, [ref('move_test1')], context=context)
+-
+  I check that the quantity on hand is 8 and 7 products are at customer location
+-
+  !python {model: product.product}: |
+    context['location'] = False
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == 8, 'Expecting 10 products in stock, got %.2f!' % (product.qty_available,)
+
+    context['location'] = ref('stock.stock_location_customers')
+    product = self.browse(cr, uid, ref('move_product'), context=context)
+    assert product.qty_available == 7, 'Expecting 7 products in customer location, got %.2f!' % (product.qty_available,)
diff --git a/addons/stock/test/packing.yml b/addons/stock/test/packing.yml
index 64f772268f4..bc73fe957fb 100644
--- a/addons/stock/test/packing.yml
+++ b/addons/stock/test/packing.yml
@@ -1,68 +1,177 @@
-- 
+-
   Create a new stockable product 
 - 
-  !record {model: product.product, id: packingtest}:
-    name: nice product
+  !record {model: product.product, id: product1}:
+    name: Nice product
+    type: product
+    categ_id: product.product_category_1
+    list_price: 100.0
+    standard_price: 70.0
+    seller_ids:
+      - delay: 1
+        name: base.res_partner_2
+        min_qty: 2.0
+        qty: 5.0
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
 - 
   Create an incoming picking for this product of 300 PCE from suppliers to stock
 - 
-  !record{model: stock.picking}: |
+  !record {model: stock.picking, id: pick1}:
+    name: Incoming picking
+    partner_id: base.res_partner_2
+    picking_type_id: picking_type_in
+    move_lines:
+      - product_id: product1
+        product_uom_qty: 300.00
+        location_id: stock_location_suppliers
+        location_dest_id: stock_location_stock
 - 
   Confirm and assign picking and prepare partial
 - 
-  !python {model: stock.picking, id:}: |
-    self.action_confirm(cr, uid, ref())
+  !python {model: stock.picking}: |
+    self.action_confirm(cr, uid, [ref('pick1')], context=context)
+    self.do_prepare_partial(cr, uid, [ref('pick1')], context=context)
 - 
   Put 120 pieces on Pallet 1 (package), 120 pieces on Pallet 2 with lot A and 60 pieces on Pallet 3
 - 
-  !python {model: stock.picking, id:} |
+  !python {model: stock.picking}: |
     #Change quantity of first to 120 and create 2 others quant operations
+    record = self.browse(cr, uid, ref('pick1'), context=context)
+    stock_pack = self.pool.get('stock.pack.operation')
+    stock_quant_pack = self.pool.get('stock.quant.package')
+    #create lot A
+    lot_a = self.pool.get('stock.production.lot').create(cr, uid, {'name': 'Lot A', 'product_id': ref('product1')}, context=context)
+    #create package
+    package1 = stock_quant_pack.create(cr, uid, {'name': 'Pallet 1'}, context=context)
+    package2 = stock_quant_pack.create(cr, uid, {'name': 'Pallet 2'}, context=context)
+    package3 = stock_quant_pack.create(cr, uid, {'name': 'Pallet 3'}, context=context)
     #Create package for each line and assign it as result_package_id
+    #create pack operation
+    stock_pack.write(cr, uid, record.pack_operation_ids[0].id, {'result_package_id': package1, 'product_qty': 120})
+    new_pack1 = stock_pack.create(cr, uid, {'product_id': ref('product1'), 'product_uom_id': ref('product.product_uom_unit'), 'picking_id': ref('pick1'), 'lot_id': lot_a, 'result_package_id': package2, 'product_qty': 120}, context=context)
+    new_pack2 = stock_pack.create(cr, uid, {'product_id': ref('product1'), 'product_uom_id': ref('product.product_uom_unit'), 'picking_id': ref('pick1'), 'result_package_id': package3, 'product_qty': 60}, context=context)
 - 
-  Use button rereserve and check the qtyremaining on the moves are correct (=0)
+  Use button rereserve and check the qtyremaining on the moves are correct (=original quantities)
 - 
-  
+  !python {model: stock.picking}: |
+    self.rereserve(cr, uid, [ref('pick1')], context=context)
+    picking = self.browse(cr, uid, ref('pick1'), context=context)
+    move_reco = picking.move_lines[0]
+    assert move_reco.remaining_qty == 300.0, "Remaining quantities should not change upon receiving"
 - 
   Transfer the reception
 - 
-
+  !python {model: stock.picking}: |
+    self.do_partial(cr, uid, [ref('pick1')], context=context)
 - 
   Check the system created 3 quants one with 120 pieces on pallet 1, one with 120 pieces on pallet 2 with lot A and 60 pieces on pallet 3
 - 
-  
+  !python {model: stock.quant}: |
+    reco_id = self.search(cr ,uid , [('product_id','=',ref('product1'))], context=context)
+    assert len(reco_id) == 3, "The number of quants created is not correct"
+    for rec in self.browse(cr, uid, reco_id, context=context):
+      if rec.package_id.name == 'Pallet 1':
+        assert rec.qty == 120, "Should have 120 pieces on pallet 1"
+      elif rec.package_id.name == 'Pallet 2':
+        assert rec.qty == 120, "Should have 120 pieces on pallet 2"
+      elif rec.package_id.name == 'Pallet 3':
+        assert rec.qty == 60, "Should have 60 pieces on pallet 3"
 - 
   Check there is no backorder or extra moves created
 - 
-  
+  !python {model: stock.picking}: |
+    picking = self.browse(cr, uid, ref('pick1'), context=context)
+    backorder = self.search(cr, uid, [('backorder_id', '=', ref('pick1'))])
+    assert not backorder, ""
+    #Check extra moves created
+    assert len(picking.move_lines) == 1, "" 
 - 
   Make a delivery order of 300 pieces to the customer
 - 
-  
+  !record {model: stock.picking, id: delivery_order1}:
+    name: outgoing picking
+    partner_id: base.res_partner_4
+    picking_type_id: stock.picking_type_out
+    move_lines:
+      - product_id: product1
+        product_uom_qty: 300.00
+        location_id: stock_location_stock
+        location_dest_id: stock_location_customers
 - 
   Assign and confirm
 - 
-  
+  !python {model: stock.picking}: |
+    self.action_confirm(cr, uid, [ref('delivery_order1')], context=context)
+    self.action_assign(cr, uid, [ref('delivery_order1')])
+    self.force_assign(cr, uid, [ref('delivery_order1')], context=context)
 - 
   Instead of doing the 300 pieces, you decide to take pallet 1 (do not mention product in operation here) and 20 pieces from lot A and 10 pieces from pallet 3
 - 
-  
+  !python {model: stock.picking}: |
+    stock_pack = self.pool.get('stock.pack.operation')
+    self.do_prepare_partial(cr, uid, [ref('delivery_order1')], context=context)
+    delivery_id = self.browse(cr, uid, ref('delivery_order1'), context=context)
+    for rec in delivery_id.pack_operation_ids:
+      if rec.package_id.name == 'Pallet 1' and rec.product_qty == 120:
+        stock_pack.write(cr, uid, rec.id, {'product_id': False}, context=context)
+      if rec.package_id.name == 'Pallet 2' and rec.lot_id.name == 'Lot A' :
+        stock_pack.write(cr, uid, rec.id, {'product_qty': 20}, context=context)
+      if rec.package_id.name == 'Pallet 3' and rec.product_qty == 60:
+        stock_pack.write(cr, uid, rec.id, {'product_qty': 10}, context=context)
 - 
   Process this picking
 - 
-  
+  !python {model: stock.picking}: |
+    self.rereserve(cr, uid, [ref('delivery_order1')], context=context)
+    self.do_partial(cr, uid, [ref('delivery_order1')], context=context)
 - 
   Check the quants that you have 120 pieces pallet 1 in customers, 100 pieces pallet 2 in stock and 20 with customers and 50 in stock, 10 in customers from pallet 3 
 - 
-  
+  !python {model: stock.quant}: |
+    reco_id = self.search(cr ,uid , [('product_id','=',ref('product1'))], context=context)
+    for rec in self.browse(cr, uid, reco_id, context=context):
+      if rec.package_id.name == 'Pallet 1' and rec.location_id.id == ref('stock_location_customers'):
+        assert rec.qty == 120, "Should have 120 pieces on pallet 1"
+      elif rec.package_id.name == 'Pallet 2' and rec.location_id.id == ref('stock_location_stock'):
+        assert rec.qty == 100, "Should have 100 pieces in stock on pallet 2"
+      elif rec.lot_id.name == 'Lot A' and rec.location_id.id == ref('stock_location_customers'):
+        assert (rec.qty == 20 and not rec.package_id), "Should have 20 pieces in customer location from pallet 2"
+      elif rec.package_id.name == 'Pallet 3' and rec.location_id.id == ref('stock_location_stock'):
+        assert rec.qty == 50, "Should have 50 pieces in stock on pallet 3"
+      elif not rec.package_id and not rec.lot_id and rec.location_id.id == ref('stock_location_customers'):
+        assert rec.qty == 10, "Should have 10 pieces in customer location from pallet 3"
+      else:
+        assert False, "Unrecognized quant"
 - 
   Check a backorder was created and on that backorder, prepare partial and add an op with 20 pieces (20 that cannot be assigned) with lot B
 - 
-  
+  !python {model: stock.picking}: |
+    picking = self.browse(cr, uid, ref('delivery_order1'), context=context)
+    backorder = self.search(cr, uid, [('backorder_id.id', '=', picking.id)], context=context)
+    assert backorder, "Backorder should have been created"
+    backorder_id = self.browse(cr, uid, backorder, context=context)
+    self.action_confirm(cr, uid, backorder, context=context)
+    self.action_assign(cr, uid, backorder)
+    self.force_assign(cr, uid, backorder, context=context)
+    self.do_prepare_partial(cr, uid, backorder, context=context)
+    #create lot B
+    lot_b = self.pool.get('stock.production.lot').create(cr, uid, {'name': 'Lot B', 'product_id': ref('product1')}, context=context)
+    stock_pack = self.pool.get('stock.pack.operation').create(cr, uid, {'picking_id': backorder_id[0].id, 'lot_id': lot_b, 'product_qty': 20})
 - 
   Process this backorder
 - 
-  
+  !python {model: stock.picking}: |
+    picking = self.browse(cr, uid, ref('delivery_order1'), context=context)
+    backorder = self.search(cr, uid, [('backorder_id.id', '=', picking.id)], context=context)
+    backorder_id = self.browse(cr, uid, backorder, context=context)
+    self.rereserve(cr, uid, [backorder_id[0].id], context=context)
+    self.do_partial(cr, uid, [backorder_id[0].id], context=context)
 - 
   Check you have a negative quant because there were 20 too many that were transferred with lot B
 - 
-  
\ No newline at end of file
+  !python {model: stock.quant}: |
+    reco_id = self.search(cr ,uid , [('product_id','=',ref('product1'))], context=context)
+    for rec in self.browse(cr, uid, reco_id, context=context):
+      if rec.lot_id.name == 'Lot B':
+        assert rec.qty != -20, "" 
diff --git a/addons/stock/test/procrule.yml b/addons/stock/test/procrule.yml
index d1762ae4806..0a13ef6f073 100644
--- a/addons/stock/test/procrule.yml
+++ b/addons/stock/test/procrule.yml
@@ -1,22 +1,40 @@
 - 
   Create new global procurement rule from Stock -> Output
 - 
-  !record {model: procurement.rule, ref:}
-    location_id: stock
-    location_dest_id: output 
+  !record {model: procurement.rule, id: global_proc_rule}:
+    name: Stock -> output
+    action: move
+    picking_type_id: stock.picking_type_out
+    location_src_id: stock.stock_location_stock
+    location_id: stock.stock_location_output 
 - 
   Create Delivery Order from Output -> Customer 
 - 
-  !record {model: stock.picking, ref:}
+  !record {model: stock.picking, id: pick_output}:
+    name: Delivery order for procurement
+    partner_id: base.res_partner_2
+    picking_type_id: stock.picking_type_out
+    move_lines:
+        - product_id: product.product_product_3
+          product_uom_qty: 10.00
+          location_id: stock.stock_location_output
+          location_dest_id: stock.stock_location_customers
+          procure_method: make_to_order
 - 
-  Confirm delivery order
+  Confirm delivery order.
 - 
-  
+  !python {model: stock.picking}: |
+    self.action_confirm(cr, uid,  [ref('pick_output')])
+-
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+    self.run_scheduler(cr, uid)
 - 
-  Check procurement was created in output (as there is the global procurement rule) related to this delivery order
+  Check a picking was created from stock to output.
 - 
-  
-- 
-  Check a picking was created from stock to output
-- 
-  
+  !python {model: stock.move }: |
+    picking = self.pool.get("stock.picking").browse(cr, uid, ref("pick_output"))
+    move_id = self.search(cr, uid, [('product_id', '=', ref('product.product_product_3')),('location_id', '=', ref('stock.stock_location_stock')),
+    ('location_dest_id', '=', ref('stock.stock_location_output')), ('move_dest_id', '=', picking.move_lines[0].id)])
+    assert len(move_id) == 1, "It should have created a picking from Stock to Output with the original picking as destination"
diff --git a/addons/stock/test/shipment.yml b/addons/stock/test/shipment.yml
index 70f9b14c57a..31b67d67b6d 100644
--- a/addons/stock/test/shipment.yml
+++ b/addons/stock/test/shipment.yml
@@ -1,108 +1,55 @@
--
-  I confirm outgoing shipment of 130 kgm Ice-cream.
--
-  !workflow {model: stock.picking, action: button_confirm, ref: outgoing_shipment}
--
-  I check shipment details after confirmed.
--
-  !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("outgoing_shipment"))
-    assert shipment.state == "confirmed", "Shipment should be confirmed."
-    for move_line in shipment.move_lines:
-        assert move_line.state == "confirmed", "Move should be confirmed."
-
--
-  Now I check vitual stock of Ice-cream after confirmed outgoing shipment.
--
-  !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
-    product.virtual_available == -30, "Vitual stock is not updated."
-
 -
   I confirm incomming shipment of 50 kgm Ice-cream.
 -
-  !workflow {model: stock.picking, action: button_confirm, ref: incomming_shipment}
+  !python {model: stock.picking}: |
+      self.action_confirm(cr, uid, [ref("incomming_shipment")])
 -
-  I receive 40kgm Ice-cream so I make backorder of incomming shipment for 40 kgm.
+  I receive 40kgm Ice-cream so It will make backorder of incomming shipment for 10 kgm.
 -
-  !python {model: stock.partial.picking}: |
+  !python {model: stock.picking}: |
+    pick = self.browse(cr, uid, ref("incomming_shipment"), context=context)
+    self.pool.get('stock.pack.operation').create(cr, uid, {
+        'picking_id': pick.id,
+        'product_id': ref('product_icecream'),
+        'product_uom_id': ref('product.product_uom_kgm'),
+        'product_qty': 40
+    })
     context.update({'active_model': 'stock.picking', 'active_id': ref('incomming_shipment'), 'active_ids': [ref('incomming_shipment')]})
+    pick.do_partial(context=context)
 -
-  !record {model: stock.partial.picking, id: partial_incomming}:
-    move_ids:
-        - quantity: 40
-          product_id: product_icecream
-          product_uom: product.product_uom_kgm
-          move_id: incomming_shipment_icecream
-          location_id: location_convenience_shop
-          location_dest_id: location_refrigerator
--
-  !python {model: stock.partial.picking }: |
-    self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
--
-  I check backorder shipment after received partial shipment.
+  I check backorder shipment after received partial shipment and check remaining shipment.
 -
   !python {model: stock.picking}: |
     shipment = self.browse(cr, uid, ref("incomming_shipment"))
-    backorder = shipment.backorder_id
-    assert backorder, "Backorder should be created after partial shipment."
-    assert backorder.state == 'done', "Backorder should be close after received."
+    for move_line in shipment.move_lines:
+        assert move_line.product_qty == 40, "Qty in shipment does not correspond."
+        assert move_line.state == 'done', "Move line of shipment should be closed."
+    backorder_id = self.search(cr, uid, [('backorder_id', '=', ref("incomming_shipment"))],context=context)
+    backorder = self.browse(cr, uid, backorder_id)[0]
     for move_line in backorder.move_lines:
-        assert move_line.product_qty == 40, "Qty in backorder does not correspond."
-        assert move_line.state == 'done', "Move line of backorder should be closed."
+        assert move_line.product_qty == 10, "Qty in backorder does not correspond."
+        assert move_line.state == 'draft', "Move line of backorder should be draft."
+    context.update({'active_model': 'stock.picking', 'active_id': backorder_id[0], 'active_ids': backorder_id})
+    self.action_confirm(cr, uid, backorder_id, context=context)
+    self.do_partial(cr, uid, backorder_id, context=context)
 -
-  I receive another 10kgm Ice-cream.
--
-  !record {model: stock.partial.picking, id: partial_incomming}:
-    move_ids:
-        - quantity: 10
-          product_id: product_icecream
-          product_uom: product.product_uom_kgm
-          move_id: incomming_shipment_icecream
-          location_id: location_convenience_shop
-          location_dest_id: location_refrigerator
--
-  !python {model: stock.partial.picking }: |
-    self.do_partial(cr, uid, [ref('partial_incomming')], context=context)
-
--
-  I check incomming shipment after received.
+  I receive the remaining 10kgm Ice-cream from the backorder.
 -
   !python {model: stock.picking}: |
-    shipment = self.browse(cr, uid, ref("incomming_shipment"))
+    backorder_id = self.search(cr, uid, [('backorder_id', '=', ref("incomming_shipment"))],context=context)
+    backorder = self.browse(cr, uid, backorder_id)[0]
+    self.pool.get('stock.pack.operation').create(cr, uid, {
+        'picking_id': backorder.id,
+        'product_id': ref('product_icecream'),
+        'product_uom_id': ref('product.product_uom_kgm'),
+        'product_qty': 10
+    })
+    backorder.do_partial(context=context)
+-
+  I check incomming shipment after reception.
+-
+  !python {model: stock.picking}: |
+    shipment = self.browse(cr, uid, self.search(cr, uid, [('backorder_id', '=', ref("incomming_shipment"))]))[0]
     assert shipment.state == 'done', "shipment should be close after received."
     for move_line in shipment.move_lines:
-        assert move_line.product_qty == 10, "Qty does not correspond."
-        assert move_line.product_id.virtual_available == 20, "Virtual stock does not correspond."
         assert move_line.state == 'done', "Move line should be closed."
-
--
-  I return last incomming shipment for 10 kgm Ice-cream.
--
-  !record {model: stock.return.picking, id: return_incomming}:
-    invoice_state: none
--
-  !python {model: stock.return.picking }: |
-    # this work without giving the id of the picking to return, magically, thanks to the context
-    self.create_returns(cr, uid, [ref('return_incomming')], context=context)
--
-  I cancel incomming shipment after return it.
--
-  !python {model: stock.picking}: |
-    # the cancel is not on the return, but on the incomming shipment (which now has a quantity of 10, thanks to the 
-    # backorder). This situation is a little weird as we returned a move that we finally cancelled... As result, only
-    # 30Kg from the original 50Kg will be counted in the stock (50 - 10 (cancelled quantity) - 10 (returned quantity))
-    self.action_cancel(cr, uid, [ref("incomming_shipment")], context=context)
--
-  I make invoice of backorder of incomming shipment.
--
-  !python {model: stock.invoice.onshipping}: |
-    shipment = self.pool.get('stock.picking').browse(cr, uid, ref("incomming_shipment"))
-    context.update({'active_model': 'stock.picking', 'active_id': shipment.backorder_id.id, 'active_ids': [shipment.backorder_id.id]})
--
-  I check available stock after received incomming shipping. (removed invoicing here)
--
-  !python {model: product.product}: |
-    product = self.browse(cr, uid, ref('product_icecream'), context=context)
-    assert product.qty_available == 140, "Stock does not correspond."
-    assert product.virtual_available == 0, "Vitual stock does not correspond."
\ No newline at end of file
diff --git a/addons/stock_account/product.py b/addons/stock_account/product.py
index 046970ec0b0..126fbe58fec 100644
--- a/addons/stock_account/product.py
+++ b/addons/stock_account/product.py
@@ -169,7 +169,7 @@ class product_product(osv.osv):
     _columns = {
         'valuation':fields.property(type='selection', selection=[('manual_periodic', 'Periodical (manual)'),
                                         ('real_time','Real Time (automated)'),], string = 'Inventory Valuation',
-                                        help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
+                                        help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves, with product price as specified by the 'Costing Method'" \
                                              "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
                                         , required=True),
     }
@@ -184,9 +184,9 @@ class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
         'cost_method': fields.property(type='selection', selection=[('standard', 'Standard Price'), ('average', 'Average Price'), ('real', 'Real Price')],
-            help="""Standard Price: The cost price is manually updated at the end of a specific period (usually every year)
-                    Average Price: The cost price is recomputed at each incoming shipment
-                    Real Price: The cost price is calculated as the real price of each outgoing product""",
+            help="""Standard Price: The cost price is manually updated at the end of a specific period (usually every year).
+                    Average Price: The cost price is recomputed at each incoming shipment and used for the product valuation.
+                    Real Price: The cost price displayed is the price of the last outgoing product (will be use in case of inventory loss for example).""",
             string="Costing Method", required=True),
         'property_stock_account_input': fields.property(
             type='many2one',
diff --git a/addons/stock_account/product_view.xml b/addons/stock_account/product_view.xml
index 0c5f59f7003..2aa7f6d8622 100644
--- a/addons/stock_account/product_view.xml
+++ b/addons/stock_account/product_view.xml
@@ -75,7 +75,7 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='properties']" position="before">
-                    <group groups="stock.group_inventory_valuation">
+                    <group>
                         <separator string="Inventory Valuation" colspan="4"/>
                         <group colspan="2" col="2">
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index e404ab3dd7b..ff48e865737 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -22,6 +22,66 @@
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+#----------------------------------------------------------
+# Procurement Rule
+#----------------------------------------------------------
+class procurement_rule(osv.osv):
+    _inherit = 'procurement.rule'
+    _columns= {
+        'invoice_state': fields.selection([
+            ("invoiced", "Invoiced"),
+            ("2binvoiced", "To Be Invoiced"),
+            ("none", "Not Applicable")], "Invoice Status",
+            required=False),
+        }
+    
+#----------------------------------------------------------
+# Procurement Order
+#----------------------------------------------------------
+
+
+class procurement_order(osv.osv):
+    _inherit = "procurement.order"
+    _columns = {
+        'invoice_state': fields.selection(
+          [("invoiced", "Invoiced"),
+            ("2binvoiced", "To Be Invoiced"),
+            ("none", "Not Applicable")
+          ], "Invoice Control", required=True),
+        }
+
+    def _run_move_create(self, cr, uid, procurement, context=None):
+        res = super(procurement_order, self)._run_move_create(cr, uid, procurement, context=context)
+        res.update({'invoice_state': (procurement.rule_id.invoice_state in ('none', False) and procurement.invoice_state or procurement.rule_id.invoice_state) or 'none'})
+        return res
+    
+    _defaults = {
+        'invoice_state': 'none'
+        }
+
+
+#----------------------------------------------------------
+# Move
+#----------------------------------------------------------
+
+class stock_move(osv.osv):
+    _inherit = "stock.move"
+    _columns = {
+        'invoice_state': fields.selection([("invoiced", "Invoiced"),
+            ("2binvoiced", "To Be Invoiced"),
+            ("none", "Not Applicable")], "Invoice Control",
+            select=True, required=True, track_visibility='onchange', 
+            states={'draft': [('readonly', False)]}),
+        }
+    _defaults= {
+        'invoice_state': lambda *args, **argv: 'none'
+        }
+
+
+
+#----------------------------------------------------------
+# Picking
+#----------------------------------------------------------
 
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
@@ -30,22 +90,13 @@ class stock_picking(osv.osv):
         for pick in self.browse(cr, uid, ids, context=context):
             result[pick.id] = 'none'
             for move in pick.move_lines:
-                if move.procurement_id:
-                    if move.procurement_id.invoice_state=='invoiced':
-                        result[pick.id] = 'invoiced'
-                    elif move.procurement_id.invoice_state=='2binvoiced':
-                        result[pick.id] = '2binvoiced'
-                        break
+                if move.invoice_state=='invoiced':
+                    result[pick.id] = 'invoiced'
+                elif move.invoice_state=='2binvoiced':
+                    result[pick.id] = '2binvoiced'
+                    break
         return result
 
-    def __get_picking_procurement(self, cr, uid, ids, context={}):
-        result = {}
-        for proc in self.pool.get('procurement.order').browse(cr, uid, ids, context=context):
-            for move in proc.move_ids:
-                if move.picking_id:
-                    result[move.picking_id.id] = True
-        return result.keys()
-
     def __get_picking_move(self, cr, uid, ids, context={}):
         res = []
         for move in self.pool.get('stock.move').browse(cr, uid, ids, context=context):
@@ -59,8 +110,8 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")
           ], string="Invoice Control", required=True, 
+
         store={
-          'procurement.order': (__get_picking_procurement, ['invoice_state'], 10),
           'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10),
           'stock.move': (__get_picking_move, ['picking_id'], 10),
         },
diff --git a/addons/stock_account/stock_account.py b/addons/stock_account/stock_account.py
index f9e62fa80e2..ecb14b1d814 100644
--- a/addons/stock_account/stock_account.py
+++ b/addons/stock_account/stock_account.py
@@ -34,11 +34,6 @@ import openerp.addons.decimal_precision as dp
 import logging
 _logger = logging.getLogger(__name__)
 
-#----------------------------------------------------------
-# Invoice state
-#----------------------------------------------------------
-
-
 
 
 #----------------------------------------------------------
@@ -75,7 +70,6 @@ class stock_quant(osv.osv):
             return line.cost * line.qty
         return super(stock_quant, self)._get_inventory_value(cr, uid, line, prodbrow, context=context)
 
-
     # FP Note: this is where we should post accounting entries for adjustment
     def _price_update(self, cr, uid, quant, newprice, context=None):
         super(stock_quant, self)._price_update(cr, uid, quant, newprice, context=context)
@@ -203,4 +197,28 @@ class stock_quant(osv.osv):
         return move_obj.create(cr, uid, {'journal_id': journal_id,
                                   'line_id': move_lines,
                                   'ref': move.picking_id and move.picking_id.name}, context=context)
+class stock_move(osv.osv):
+    _inherit = "stock.move"
 
+    def action_done(self, cr, uid, ids, context=None):
+        super(stock_move, self).action_done(cr, uid, ids, context=context)
+        self.product_price_update(cr, uid, ids, context=context)
+
+    def product_price_update(self, cr, uid, ids, context=None):
+        '''
+        This method adapts the price on the product when necessary (if the cost_method is 'real'), so that a return or an inventory loss is made using the last value used for an outgoing valuation.
+        '''
+        product_obj = self.pool.get('product.product')
+        for move in self.browse(cr, uid, ids, context=context):
+            if move.product_id.cost_method == 'real' and move.location_dest_id.usage != 'internal':
+                if any([q.qty <= 0 for q in move.quant_ids]):
+                    #if there is a negative quant, the standard price shouldn't be updated
+                    continue
+                #get the average price of the move
+                #Note: here we can't use the quant.cost directly as we may have moved out 2 units (1 unit to 5€ and 1 unit to 7€) and in case of a product return of 1 unit, we can't know which of the 2 cost has to be used (5€ or 7€?). So at that time, thanks to the average valuation price we are storing we will svaluate it at 6€
+                average_valuation_price = 0.0
+                for q in move.quant_ids:
+                    average_valuation_price += q.qty * q.cost
+                average_valuation_price = average_valuation_price / move.product_qty
+                product_obj.write(cr, uid, move.product_id.id, {'standard_price': average_valuation_price}, context=context)
+                self.write(cr, uid, move.id, {'price_unit': average_valuation_price}, context=context)
diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index a7e6bc8afe9..6f3d469b440 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -29,7 +29,27 @@
                 <xpath expr="//field[@name='move_type']" position="after">
                     <field name="invoice_state" groups="account.group_account_invoice"/>
                 </xpath>
-
+            </field>
+        </record>
+        
+        <record id="view_move_form_inherit" model="ir.ui.view">
+            <field name="name">stock.move.form.inherit</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='picking_type_id']" position="after">
+                    <field name="invoice_state" groups="account.group_account_invoice"/>
+                </xpath>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_procurement_rule_form_inherit">
+            <field name="name">stock.procurement.rule.inherit.form</field>
+            <field name="model">procurement.rule</field>
+            <field name="inherit_id" ref="stock.view_procurement_rule_form"/>
+            <field name="arch" type="xml">
+                <field name="location_id" position="after">
+                    <field name="invoice_state"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/stock_complex_routes/stock_complex_routes.xml b/addons/stock_complex_routes/stock_complex_routes.xml
index d1850560e5f..f2c71735527 100644
--- a/addons/stock_complex_routes/stock_complex_routes.xml
+++ b/addons/stock_complex_routes/stock_complex_routes.xml
@@ -14,7 +14,7 @@
         <record id="picking_type_dropship" model="stock.picking.type">
             <field name="name">dropship</field>
             <field name="sequence_id" ref="seq_picking_type_dropship"/>
-            <field name="code_id" ref="stock.picking_code_in"/>
+            <field name="code_id">incoming</field>
         </record>
         
         
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 77d1a67149a..4b3d32d9fcc 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -29,28 +29,20 @@ class stock_location_route(osv.osv):
     _description = "Inventory Routes"
     _order = 'sequence'
 
-    def _default_warehouse(self, cr, uid, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', user.company_id.id)], limit=1, context=context)
-        return res and res[0] or False
-
     _columns = {
         'name': fields.char('Route Name', required=True),
         'sequence': fields.integer('Sequence'),
         'pull_ids': fields.one2many('procurement.rule', 'route_id', 'Pull Rules'),
         'push_ids': fields.one2many('stock.location.path', 'route_id', 'Push Rules'),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
     }
     _defaults = {
         'sequence': lambda self,cr,uid,ctx: 0,
-        'warehouse_id': _default_warehouse,
     }
 
 class stock_warehouse(osv.osv):
     _inherit = 'stock.warehouse'
     _columns = {
-        'route_id': fields.many2one('stock.location.route', 'Default Logistic Route', help='Default route through the warehouse', required=True), 
-        'route_ids': fields.one2many('stock.location.route', 'warehouse_id', 'All Routes'),
+        'route_id': fields.many2one('stock.location.route', 'Default Routes', help='Default route through the warehouse', required=True), 
     }
 
 
@@ -133,18 +125,13 @@ class procurement_rule(osv.osv):
         'delay': fields.integer('Number of Hours'),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'partner_address_id': fields.many2one('res.partner', 'Partner Address'),
-        'invoice_state': fields.selection([
-            ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not Applicable")], "Invoice Status",
-            required=True,),
+
         'route_sequence': fields.related('route_id', 'sequence', string='Route Sequence', store={'stock.location.route': (_get_rules, ['sequence'], 10)}),
         'sequence': fields.integer('Sequence'),
         'propagate': fields.boolean('Propagate cancel and split', help='If checked, when the previous move of the move (which was generated by a next procurement) is cancelled or split, the move generated by this move will too'),
     }
     _defaults = {
         'procure_method': 'make_to_stock',
-        'invoice_state': 'none',
         'propagate': True, 
         'delay': 0, 
     }
@@ -155,7 +142,7 @@ class procurement_rule(osv.osv):
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
     _columns = {
-        'route_ids': fields.many2many('stock.location.route', 'stock_location_route_procurement', 'procurement_id', 'route_id', 'Destination route', help="Preferred route to be followed by the procurement order"),
+        'route_ids': fields.many2many('stock.location.route', 'stock_location_route_procurement', 'procurement_id', 'route_id', 'Followed Route', help="Preferred route to be followed by the procurement order"),
         }
     
     def _run_move_create(self, cr, uid, procurement, context=None):
@@ -181,13 +168,10 @@ class procurement_order(osv.osv):
 
     def _search_suitable_rule(self, cr, uid, procurement, domain, context=None):
         '''we try to first find a rule among the ones defined on the procurement order group and if none is found, we try on the routes defined for the product, and finally we fallback on the default behavior'''
-        route_ids = [x.id for x in procurement.route_ids]
+        route_ids = [x.id for x in procurement.route_ids] + [x.id for x in procurement.product_id.route_ids] 
         res = self.pool.get('procurement.rule').search(cr, uid, domain + [('route_id', 'in', route_ids)], order = 'route_sequence, sequence', context=context)
         if not res:
-            route_ids = [x.id for x in procurement.product_id.route_ids]
-            res = self.pool.get('procurement.rule').search(cr, uid, domain + [('route_id', 'in', route_ids)], order = 'route_sequence, sequence', context=context)
-            if not res:
-                res = self.pool.get('procurement.rule').search(cr, uid, domain, order='sequence', context=context)
+            res = self.pool.get('procurement.rule').search(cr, uid, domain, order='sequence', context=context)
         return res
 
 
diff --git a/addons/stock_location/stock_location_data.xml b/addons/stock_location/stock_location_data.xml
index b282fcbf08c..c5f438b920a 100644
--- a/addons/stock_location/stock_location_data.xml
+++ b/addons/stock_location/stock_location_data.xml
@@ -22,7 +22,7 @@
         -->
 
         <record id="route_warehouse0_mts" model='stock.location.route'>
-            <field name="name">Ship only</field>
+            <field name="name">Sale: Ship only</field>
             <field name="sequence">20</field>
         </record>
 
@@ -79,7 +79,7 @@
         </record>
         
         <record id="route_warehouse0_pack" model='stock.location.route'>
-            <field name="name">Pack + Ship</field>
+            <field name="name">Sale: Pack + Ship</field>
             <field name="sequence">15</field>
         </record>
 
@@ -128,7 +128,7 @@
         
         <!-- Pick + pack + ship -->
         <record id="route_warehouse0_pickpack" model='stock.location.route'>
-            <field name="name">Pick + Pack + Ship</field>
+            <field name="name">Sale: Pick + Pack + Ship</field>
             <field name="sequence">20</field>
         </record>
 
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 227be08333f..f89a1f98002 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -38,7 +38,6 @@
             <field name="location_src_id" ref="stock.stock_location_intermediatelocation0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
             <field name="partner_address_id" ref="base.main_partner"/>
-            <field name="invoice_state">none</field>
             <field name="company_id" ref="stock.res_company_1"/>
             <field name="type_proc">move</field>
             <field eval="0" name="propagate"/>
@@ -53,7 +52,6 @@
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="partner_address_id" ref="stock.res_partner_address_41"/>
             <field name="type_proc">move</field>
-            <field name="invoice_state">none</field>
             <field name="company_id" ref="base.main_company"/>
             <field eval="0" name="propagate"/>
             <field name="procure_method">make_to_stock</field>
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index f3a0a0726c9..79d27aa1bbc 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -17,7 +17,6 @@
                 </field>
                 <field name="group_id" position="before">
                 	<field name="procure_method"/>
-                	<field name="invoice_state"/>
                 	<field name="partner_address_id"/>
                 </field>
             </field>
@@ -128,7 +127,7 @@
 			<field name="arch" type="xml">
 				<group name="inventory" position="after">
 					<group string="Routes">
-						<field name="route_ids" colspan="4" nolabel="1" />
+						<field name="route_ids" colspan="4" nolabel="1" widget="many2many_tags"/>
 					</group>
 				</group>
 			</field>
@@ -143,7 +142,7 @@
 			<field name="arch" type="xml">
 				<xpath expr="//sheet" position="inside">
 					<group string="Strategy" colspan="4">
-						<field name="route_ids" colspan="4" nolabel="1" />
+						<field name="route_ids" colspan="4" nolabel="1" widget="many2many_tags"/>
 					</group>
 				</xpath>
 			</field>
@@ -155,15 +154,7 @@
             <field name="inherit_id" ref="stock.view_warehouse"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='partner_id']" position="after">
-                    <field name="route_id"/>
-                </xpath>
-                <xpath expr="//group[last()]" position="after">
-                	<separator string="All Associated Routes"/>
-                	<field name="route_ids" nolabel="1" colspan="4">
-                		<tree string="All Routes">
-                		<field name="name"/>
-                		</tree>
-                	</field>
+                    <field name="route_id" widget="many2many_tags"/>
                 </xpath>
             </field>
         </record>
@@ -175,7 +166,6 @@
 				<tree string="Routes">
                     <field name="sequence" widget="handle" />
 					<field name="name"/>
-					<field name="warehouse_id"/>
 				</tree>
 			</field>
 		</record>
@@ -188,7 +178,6 @@
 				<form string="Route">
 					<field name="name" />
 					<field name="sequence" groups="base.group_no_one"/>
-					<field name="warehouse_id"/>
 					<group string="Push Rules" colspan="4" >
 						<field name="push_ids" colspan="4" nolabel="1"/>
                     </group>
@@ -200,7 +189,7 @@
 		</record>
 
 		<record id="action_routes_form" model="ir.actions.act_window">
-			<field name="name">Logistic Routes</field>
+			<field name="name">Routes</field>
 			<field name="res_model">stock.location.route</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="view_type">form</field>
@@ -208,9 +197,9 @@
 			<field name="view_id" ref="stock_location_route_tree" />
 			<field name="help" type="html">
 				<p class="oe_view_nocontent_create">
-					Click to add a logistic route.
+					Click to add a route.
               </p>
-				<p>You can define here the main logistic routes that run through
+				<p>You can define here the main routes that run through
 					your warehouses and that define the flows of your products. These
 					routes can be assigned to a product, a product category or be fixed
 					on procurement or sales order. </p>
diff --git a/addons/stock_multi_warehouse/__init__.py b/addons/stock_multi_warehouse/__init__.py
new file mode 100644
index 00000000000..16b38f5dadd
--- /dev/null
+++ b/addons/stock_multi_warehouse/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import stock_multi_warehouse
\ No newline at end of file
diff --git a/addons/stock_multi_warehouse/__openerp__.py b/addons/stock_multi_warehouse/__openerp__.py
new file mode 100644
index 00000000000..a93893300a8
--- /dev/null
+++ b/addons/stock_multi_warehouse/__openerp__.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Multi-warehouse',
+    'version': '1.0',
+    'category': 'Warehousing',
+    'description': """
+This module supplements the Warehouse application with demo data for multiple warehouses
+========================================================================================
+It creates 3 warehouses
+
+    """,
+    'author': 'OpenERP SA',
+    'images': [],
+    'depends': ['stock_complex_routes'],
+    'data': ['stock_multi_warehouse.yml'],
+    'demo': [
+        
+    ],
+    'installable': True,
+    'test': [
+    ],
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_multi_warehouse/stock_multi_warehouse.py b/addons/stock_multi_warehouse/stock_multi_warehouse.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/stock_multi_warehouse/stock_multi_warehouse.yml b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
new file mode 100644
index 00000000000..14cbfbc9ae3
--- /dev/null
+++ b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
@@ -0,0 +1,127 @@
+- 
+  Create Panama in Location structure
+- 
+  !record {model: stock.location, id: location_panama}:
+    name: Panama
+    location_id: stock.stock_location_locations
+- 
+  Create Location structure of Warehouse Panama Santiago District
+- 
+  !record {model: stock.location, id: location_panama_santiago}:
+    name: Panama Santiago District Warehouse
+    location_id: location_panama
+- 
+  Input
+- 
+  !record {model: stock.location, id: location_panama_santiago_input}:
+    name: Input
+    location_id: location_panama_santiago
+- 
+  Output
+- 
+  !record {model: stock.location, id: location_panama_santiago_output}:
+    name: Output
+    location_id: location_panama_santiago
+- 
+  Stock
+- 
+  !record {model: stock.location, id: location_panama_santiago_stock}:
+    name: Stock
+    location_id: location_panama_santiago
+    child_ids:
+      - name: Area1
+        child_ids:
+          - name: Bin 1
+          - name: Bin 2
+          - name: Bin 3
+          - name: Bin 4
+          - name: Bin 5
+          - name: Bin 6
+          - name: Bin 7
+          - name: Bin 8
+          - name: Bin 9
+          - name: Bin 10
+          - name: Bin 11
+          - name: Bin 12
+          - name: Bin 13
+          - name: Bin 14
+          - name: Bin 15
+- 
+  Create  warehouse Panama Santiago District
+- 
+  !record {model: stock.warehouse, id: wh_panama_santiago}:
+    name: Panama Santiago District Warehouse
+    lot_stock_id: location_panama_santiago
+- 
+  Create picking types for this warehouse
+- 
+  !record {model: stock.picking.type, id: picking_type_santiago_in}:
+    name: Reception
+    code_id: incoming
+    sequence_id: stock.seq_picking_type_in
+    warehouse_id: wh_panama_santiago
+    default_location_dest_id: location_panama_santiago_input 
+- 
+  Create Location structure of Warehouse Panama Main
+- 
+  !record {model: stock.location, id: location_panama_main}:
+    name: Panama Main Warehouse
+    location_id: location_panama
+- 
+  Input
+- 
+  !record {model: stock.location, id: location_panama_main_input}:
+    name: Input
+    location_id: location_panama_main
+- 
+  Output
+- 
+  !record {model: stock.location, id: location_panama_main_output}:
+    name: Output
+    location_id: location_panama_main
+- 
+  Stock
+- 
+  !record {model: stock.location, id: location_panama__main_stock}:
+    name: Stock
+    location_id: location_panama_main
+- 
+  Create  warehouse Panama Santiago District
+- 
+  !record {model: stock.warehouse, id: wh_panama_main}:
+    name: Panama Main Warehouse
+    lot_stock_id: location_panama_main
+- 
+  Create Location structure of Warehouse Dubai
+- 
+  !record {model: stock.location, id: location_panama_main}:
+    name: Panama Main Warehouse
+    location_id: location_panama
+    child_ids:
+      - name: Input
+      - name: Output
+      - name: Stock
+- 
+  Create United Arab Emirates in Location structure
+- 
+  !record {model: stock.location, id: location_uae}:
+    name: United Arab Emirates
+    location_id: stock.stock_location_locations
+- 
+  Create Location structure of Dubai Warehouse
+- 
+  !record {model: stock.location, id: location_dubai}:
+    name: Dubai Warehouse
+    location_id: location_uae
+    child_ids:
+      - name: Input
+      - name: Output
+      - name: Stock
+        child_ids:
+          - name: Area3
+- 
+  Create Dubai warehouse
+- 
+  !record {model: stock.warehouse, id: wh_dubai}:
+    name: Dubai Warehouse
+    lot_stock_id: location_dubai
\ No newline at end of file