From 064b1a3a404eef5c5140c33d405c9ac1ea0066b0 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 1 Sep 2014 15:39:32 +0200
Subject: [PATCH 01/12] [IMP] Old hack where uom_id had to be empty in
 on_change

[IMP] Add purchase order origin on picking

[WIP] Picking type on move for location on routing

[IMP] Provide extra function for custom buttons on picking

[IMP] Action assign optim

[IMP] Push apply should take invoice_state into account.  Propagation of cancel of stock moves should depend on procurement rule
---
 addons/mrp/mrp.py               |  7 +++++++
 addons/purchase/purchase.py     |  4 +++-
 addons/sale_stock/sale_stock.py |  2 +-
 addons/stock/stock.py           | 30 ++++++++++++++++++------------
 addons/stock_account/stock.py   |  5 +++++
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 9e6afe3cc2c..2c484808064 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1059,19 +1059,25 @@ class mrp_production(osv.osv):
             return "make_to_order"
         return "make_to_stock"
 
+
+
     def _create_previous_move(self, cr, uid, move_id, product, source_location_id, dest_location_id, context=None):
         '''
         When the routing gives a different location than the raw material location of the production order, 
         we should create an extra move from the raw material location to the location of the routing, which 
         precedes the consumption line (chained)
         '''
+        
         stock_move = self.pool.get('stock.move')
+        type_obj = self.pool.get('stock.picking.type')
+        types = type_obj.search(cr, uid, [('code','=','outgoing')], context=context)
         move = stock_move.copy(cr, uid, move_id, default = {
             'location_id': source_location_id,
             'location_dest_id': dest_location_id,
             'procure_method': self._get_raw_material_procure_method(cr, uid, product, context=context),
             'raw_material_production_id': False, 
             'move_dest_id': move_id,
+            'picking_type_id': types and types[0] or False,
         }, context=context)
         return move
 
@@ -1109,6 +1115,7 @@ class mrp_production(osv.osv):
         
         if prev_move:
             prev_move = self._create_previous_move(cr, uid, move_id, product, prod_location_id, source_location_id, context=context)
+            stock_move.action_confirm(cr, uid, [prev_move], context=context)
         return move_id
 
     def _make_production_consume_line(self, cr, uid, line, context=None):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index fb2a40d2741..2cd492e1b9f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -741,6 +741,7 @@ class purchase_order(osv.osv):
                 'group_id': procurement.group_id.id or group_id,  #move group is same as group of procurements if it exists, otherwise take another group
                 'procurement_id': procurement.id,
                 'invoice_state': procurement.rule_id.invoice_state or (procurement.location_id and procurement.location_id.usage == 'customer' and procurement.invoice_state=='picking' and '2binvoiced') or (order.invoice_method == 'picking' and '2binvoiced') or 'none', #dropship case takes from sale
+                'propagate': procurement.rule_id.propagate,
             })
             diff_quantity -= min(procurement_qty, diff_quantity)
             res.append(tmp)
@@ -821,7 +822,8 @@ class purchase_order(osv.osv):
             picking_vals = {
                 'picking_type_id': order.picking_type_id.id,
                 'partner_id': order.dest_address_id.id or order.partner_id.id,
-                'date': max([l.date_planned for l in order.order_line])
+                'date': max([l.date_planned for l in order.order_line]),
+                'origin': order.name
             }
             picking_id = self.pool.get('stock.picking').create(cr, uid, picking_vals, context=context)
             self._create_stock_moves(cr, uid, order, order.order_line, picking_id, context=context)
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 4371a40a100..7fef11b7472 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -289,7 +289,7 @@ class sale_order_line(osv.osv):
         product_obj = self.pool.get('product.product')
         warning = {}
         res = self.product_id_change(cr, uid, ids, pricelist, product, qty=qty,
-            uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
+            uom=False, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
 
         if not product:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 47bf0ad29bd..acbc9b672c3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3503,6 +3503,22 @@ class stock_location_path(osv.osv):
         'active': True,
     }
 
+    def _prepare_push_apply(self, cr, uid, rule, move, context=None):
+        newdate = (datetime.strptime(move.date_expected, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta.relativedelta(days=rule.delay or 0)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return {
+                'location_id': move.location_dest_id.id,
+                'location_dest_id': rule.location_dest_id.id,
+                'date': newdate,
+                'company_id': rule.company_id and rule.company_id.id or False,
+                'date_expected': newdate,
+                'picking_id': False,
+                'picking_type_id': rule.picking_type_id and rule.picking_type_id.id or False,
+                'propagate': rule.propagate,
+                'push_rule_id': rule.id,
+                'warehouse_id': rule.warehouse_id and rule.warehouse_id.id or False,
+            }
+        
+
     def _apply(self, cr, uid, rule, move, context=None):
         move_obj = self.pool.get('stock.move')
         newdate = (datetime.strptime(move.date_expected, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta.relativedelta(days=rule.delay or 0)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
@@ -3519,18 +3535,8 @@ class stock_location_path(osv.osv):
                 #call again push_apply to see if a next step is defined
                 move_obj._push_apply(cr, uid, [move], context=context)
         else:
-            move_id = move_obj.copy(cr, uid, move.id, {
-                'location_id': move.location_dest_id.id,
-                'location_dest_id': rule.location_dest_id.id,
-                'date': newdate,
-                'company_id': rule.company_id and rule.company_id.id or False,
-                'date_expected': newdate,
-                'picking_id': False,
-                'picking_type_id': rule.picking_type_id and rule.picking_type_id.id or False,
-                'propagate': rule.propagate,
-                'push_rule_id': rule.id,
-                'warehouse_id': rule.warehouse_id and rule.warehouse_id.id or False,
-            })
+            vals = self._prepare_push_apply(cr, uid, rule, move, context=context)
+            move_id = move_obj.copy(cr, uid, move.id, vals, context=context)
             move_obj.write(cr, uid, [move.id], {
                 'move_dest_id': move_id,
             })
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index 644128f2b5f..7a0d5ccca3b 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -33,6 +33,11 @@ class stock_location_path(osv.osv):
         'invoice_state': '',
     }
 
+    def _prepare_push_apply(self, cr, uid, rule, move, context=None):
+        res = super(stock_location_path, self)._prepare_push_apply(cr, uid, rule, move, context=context)
+        res['invoice_state'] = rule.invoice_state or 'none'
+        return res
+
 #----------------------------------------------------------
 # Procurement Rule
 #----------------------------------------------------------

From 8b204e675197861e4f226d69fe18e5ea14698820 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 3 Sep 2014 15:24:49 +0200
Subject: [PATCH 02/12] [IMP] Make sure property_ids on sale order line are
 visible and able to work

---
 addons/sale_mrp/sale_mrp.py           | 10 ++++++++++
 addons/sale_mrp/sale_mrp_view.xml     | 13 +++++++++++++
 addons/sale_stock/sale_stock_view.xml |  4 ----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 52f9f018841..082323ad580 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -90,3 +90,13 @@ class sale_order_line(osv.osv):
     _columns = {
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
     }
+    
+
+class stock_move(osv.osv):
+    _inherit = 'stock.move'
+    
+    def _prepare_procurement_from_move(self, cr, uid, move, context=None):
+        res = super(stock_move, self)._prepare_procurement_from_move(cr, uid, move, context=context)
+        if res and move.procurement_id and move.procurement_id.property_ids:
+            res['property_ids'] = [(6, 0, [x.id for x in move.procurement_id.property_ids])]
+        return res
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index 3c2771f55a5..71e0aada1ea 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -16,5 +16,18 @@
             </field>
         </record>
 
+        <record id="view_order_form_inherit_mrp" model="ir.ui.view">
+            <field name="name">sale.order.form.sale.stock.mrp</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+               <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
+                   <field name="property_ids" widget="many2many_tags"
+                        groups="sale.group_mrp_properties"/>
+               </xpath>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 48e41f9f28c..f3db20171b4 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -62,10 +62,6 @@
                            <field name="delay" class="oe_inline"/> days
                        </div>
                    </xpath>
-                   <!--<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
-                       <field name="property_ids" widget="many2many_tags"
-                            groups="sale.group_mrp_properties"/>
-                   </xpath>-->
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
                        <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_tmpl_id','=',product_id)]" groups="product.group_stock_packaging"  />
                    </xpath>

From a0d855ffad5851ba8f2873a74f82509946e67423 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 3 Sep 2014 19:15:10 +0200
Subject: [PATCH 03/12] [IMP] Inter-company pricing: put price on move when
 only partner and not connected to sale or purchase + invoice_state inverse
 function

---
 addons/purchase/purchase.py   |  2 +-
 addons/purchase/stock.py      |  3 +--
 addons/stock/stock.py         | 27 ++++++++++++++++++-----
 addons/stock_account/stock.py | 41 ++++++++++++++++++++++++++++++-----
 4 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2cd492e1b9f..02296ce4650 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -727,7 +727,7 @@ class purchase_order(osv.osv):
             'origin': order.name,
             'route_ids': order.picking_type_id.warehouse_id and [(6, 0, [x.id for x in order.picking_type_id.warehouse_id.route_ids])] or [],
             'warehouse_id':order.picking_type_id.warehouse_id.id,
-            'invoice_state': order.invoice_method == 'picking' and '2binvoiced' or 'none'
+            'invoice_state': order.invoice_method == 'picking' and '2binvoiced' or 'none',
         }
 
         diff_quantity = order_line.product_qty
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 508b9a0babf..75fabe42f5c 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -53,7 +53,6 @@ class stock_move(osv.osv):
             default['purchase_line_id'] = False
         return super(stock_move, self).copy(cr, uid, id, default, context)
 
-
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
         invoice_line_id = super(stock_move, self)._create_invoice_line_from_vals(cr, uid, move, invoice_line_vals, context=context)
         if move.purchase_line_id:
@@ -69,7 +68,7 @@ class stock_move(osv.osv):
     def _get_master_data(self, cr, uid, move, company, context=None):
         if move.purchase_line_id:
             purchase_order = move.purchase_line_id.order_id
-            return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.pricelist_id.currency_id.id
+            return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.currency_id.id
         return super(stock_move, self)._get_master_data(cr, uid, move, company, context=context)
 
     def _get_invoice_line_vals(self, cr, uid, move, partner, inv_type, context=None):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index acbc9b672c3..531b2fa6257 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1525,12 +1525,6 @@ class stock_move(osv.osv):
             res.append((line.id, name))
         return res
 
-    def create(self, cr, uid, vals, context=None):
-        if vals.get('product_id') and not vals.get('price_unit'):
-            prod_obj = self.pool.get('product.product')
-            vals['price_unit'] = prod_obj.browse(cr, uid, vals['product_id'], context=context).standard_price
-        return super(stock_move, self).create(cr, uid, vals, context=context)
-
     def _quantity_normalize(self, cr, uid, ids, name, args, context=None):
         uom_obj = self.pool.get('product.uom')
         res = {}
@@ -2020,6 +2014,26 @@ class stock_move(osv.osv):
             date_expected = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         return {'value': {'date': date_expected}}
 
+    def attribute_price(self, cr, uid, move, context=None):
+        """
+            Attribute price to move, important in multi-company
+        """
+        if move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
+            partner = move.partner_id or (move.picking_id and move.picking_id.partner_id)
+            price = False
+            # If partner given, search price in its purchase pricelist
+            if partner and partner.property_product_pricelist_purchase:
+                pricelist_obj = self.pool.get("product.pricelist")
+                pricelist = partner.property_product_pricelist.id
+                price = pricelist_obj.price_get(cr, uid, [pricelist],
+                                    move.product_id.id, move.product_uom_qty, partner, {
+                                                                                'uom': move.product_uom.id,
+                                                                                'date': move.date,
+                                                                                })[pricelist]
+            if not price:
+                price = move.product_id.standard_price
+            self.write(cr, uid, [move.id], {'price_unit': price})
+
 
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms stock move or put it in waiting if it's linked to another move.
@@ -2033,6 +2047,7 @@ class stock_move(osv.osv):
         }
         to_assign = {}
         for move in self.browse(cr, uid, ids, context=context):
+            self.attribute_price(cr, uid, move, context=context)
             state = 'confirmed'
             #if the move is preceeded, then it's waiting (if preceeding move is done, then action_assign has been called already and its state is already available)
             if move.move_orig_ids:
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index 7a0d5ccca3b..e4d58e39bda 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -96,7 +96,13 @@ class stock_move(osv.osv):
 
     def _get_master_data(self, cr, uid, move, company, context=None):
         ''' returns a tuple (browse_record(res.partner), ID(res.users), ID(res.currency)'''
-        return move.picking_id.partner_id, uid, company.currency_id.id
+        currency = company.currency_id.id
+        if move.partner_id:
+            if move.partner_id.property_product_pricelist_purchase and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal':
+                currency = move.partner_id.property_product_pricelist_purchase.currency_id.id
+            elif move.partner_id.property_product_pricelist and move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal':
+                currency = move.partner_id.property_product_pricelist.currency_id.id
+        return move.picking_id.partner_id, uid, currency
 
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
         return self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)
@@ -110,10 +116,26 @@ class stock_move(osv.osv):
         if context is None:
             context = {}
         if type in ('in_invoice', 'in_refund'):
-            # Take the user company and pricetype
-            product = move_line.product_id.with_context(currency_id=move_line.company_id.currency_id.id)
-            amount_unit = product.price_get('standard_price')[move_line.product_id.id]
-            return amount_unit
+            if move_line.partner_id:
+                return move_line.price_unit
+            else:
+                # Take the user company and pricetype
+                # TODO: This intercompany still needed?
+                product = move_line.product_id.with_context(currency_id=move_line.company_id.currency_id.id)
+                amount_unit = product.price_get('standard_price')[move_line.product_id.id]
+                return amount_unit
+        else:
+            # If partner given, search price in its sale pricelist
+            if move_line.partner_id and move_line.partner_id.property_product_pricelist:
+                pricelist_obj = self.pool.get("product.pricelist")
+                pricelist = move_line.partner_id.property_product_pricelist.id
+                price = pricelist_obj.price_get(cr, uid, [pricelist],
+                        product, move_line.product_uom_qty, move_line.partner_id.id, {
+                            'uom': move_line.product_uom.id,
+                            'date': move_line.date,
+                            })[pricelist]
+                if price:
+                    return price
         return move_line.product_id.list_price
 
     def _get_invoice_line_vals(self, cr, uid, move, partner, inv_type, context=None):
@@ -172,13 +194,20 @@ class stock_picking(osv.osv):
                 res.append(move.picking_id.id)
         return res
 
+    def _set_inv_state(self, cr, uid, picking_id, name, value, arg, context=None):
+        pick = self.browse(cr, uid, picking_id, context=context)
+        moves = [x.id for x in pick.move_lines]
+        move_obj= self.pool.get("stock.move")
+        move_obj.write(cr, uid, moves, {'invoice_state': pick.invoice_state})
+
+
     _columns = {
         'invoice_state': fields.function(__get_invoice_state, type='selection', selection=[
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")
           ], string="Invoice Control", required=True,
-
+        fnct_inv = _set_inv_state,
         store={
             'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10),
             'stock.move': (__get_picking_move, ['picking_id', 'invoice_state'], 10),

From 246c425226908ebb43d126da9c1632e8b3c9f1bd Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 4 Sep 2014 14:54:39 +0200
Subject: [PATCH 04/12] [WIP] Pricelist of purchase is not in stock only and
 remove product_manufacturer module in view + manufacturer

---
 addons/mrp/report/bom_structure.py |  4 ++--
 addons/mrp/res_config.py           |  1 +
 addons/mrp/res_config_view.xml     |  4 ----
 addons/product/product.py          |  1 +
 addons/purchase/stock.py           | 31 ++++++++++++++++++++++++++++++
 addons/stock/stock.py              | 19 +++---------------
 addons/stock_account/stock.py      | 11 +++++------
 7 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index 1b286feac46..c8a3132a679 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -59,10 +59,10 @@ class bom_structure(report_sxw.rml_parse):
         return children
 
 
-class report_lunchorder(osv.AbstractModel):
+class report_mrpbomstructure(osv.AbstractModel):
     _name = 'report.mrp.report_mrpbomstructure'
     _inherit = 'report.abstract_report'
-    _template = 'mpr.report_mrpbomstructure'
+    _template = 'mrp.report_mrpbomstructure'
     _wrapped_report_class = bom_structure
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 71635cc9e6e..5edebfa0772 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -52,6 +52,7 @@ class mrp_config_settings(osv.osv_memory):
         'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."""),
+        #FIXME: Should be removed as module product_manufacturer has been removed
         'module_product_manufacturer': fields.boolean("Define manufacturers on products ",
             help='This allows you to define the following for a product:\n'
                  '* Manufacturer\n'
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index d9af7a688bc..7dfba32450c 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -54,10 +54,6 @@
                     <group >
                         <label for="id" string="Products"/>
                         <div>
-                            <div>
-                                <field name="module_product_manufacturer" class="oe_inline"/>
-                                <label for="module_product_manufacturer"/>
-                            </div>
                             <div>
                                 <field name="group_mrp_properties" class="oe_inline"/>
                                 <label for="group_mrp_properties" />
diff --git a/addons/product/product.py b/addons/product/product.py
index feabe13d907..009377c7221 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -1211,6 +1211,7 @@ class product_supplierinfo(osv.osv):
         for supplier in partner_pool.browse(cr, uid, supplier_ids, context=context):
             price = product_price
             # Compute price from Purchase pricelist of supplier
+            #FIXME: property_product_pricelist_purchase is defined in purchase
             pricelist_id = supplier.property_product_pricelist_purchase.id
             if pricelist_id:
                 price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty, context=context).setdefault(pricelist_id, 0)
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 75fabe42f5c..0875ff88fab 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -69,8 +69,15 @@ class stock_move(osv.osv):
         if move.purchase_line_id:
             purchase_order = move.purchase_line_id.order_id
             return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.currency_id.id
+        else:
+            partner = move.partner_id or (move.picking_id and move.picking_id.partner_id) or False
+            if partner:
+                if partner.property_product_pricelist_purchase and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal':
+                    currency = partner.property_product_pricelist_purchase.currency_id.id
+                    return partner, uid, currency
         return super(stock_move, self)._get_master_data(cr, uid, move, company, context=context)
 
+
     def _get_invoice_line_vals(self, cr, uid, move, partner, inv_type, context=None):
         res = super(stock_move, self)._get_invoice_line_vals(cr, uid, move, partner, inv_type, context=context)
         if move.purchase_line_id:
@@ -79,6 +86,30 @@ class stock_move(osv.osv):
             res['price_unit'] = purchase_line.price_unit
         return res
 
+
+    def attribute_price(self, cr, uid, move, context=None):
+        """
+            Attribute price to move, important in inter-company moves or receipts with only one partner
+        """
+        if move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
+            partner = move.partner_id or (move.picking_id and move.picking_id.partner_id)
+            price = False
+            # If partner given, search price in its purchase pricelist
+            if partner and partner.property_product_pricelist_purchase:
+                pricelist_obj = self.pool.get("product.pricelist")
+                pricelist = partner.property_product_pricelist.id
+                price = pricelist_obj.price_get(cr, uid, [pricelist],
+                                    move.product_id.id, move.product_uom_qty, partner, {
+                                                                                'uom': move.product_uom.id,
+                                                                                'date': move.date,
+                                                                                })[pricelist]
+                if price:
+                    self.write(cr, uid, [move.id], {'price_unit': price}, context=context)
+                return True
+        super(stock_move, self).attribute_price(cr, uid, move, context=context)
+
+
+
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 531b2fa6257..56d525ab158 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2016,23 +2016,10 @@ class stock_move(osv.osv):
 
     def attribute_price(self, cr, uid, move, context=None):
         """
-            Attribute price to move, important in multi-company
+            Attribute price to move, important in inter-company moves or receipts with only one partner
         """
-        if move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
-            partner = move.partner_id or (move.picking_id and move.picking_id.partner_id)
-            price = False
-            # If partner given, search price in its purchase pricelist
-            if partner and partner.property_product_pricelist_purchase:
-                pricelist_obj = self.pool.get("product.pricelist")
-                pricelist = partner.property_product_pricelist.id
-                price = pricelist_obj.price_get(cr, uid, [pricelist],
-                                    move.product_id.id, move.product_uom_qty, partner, {
-                                                                                'uom': move.product_uom.id,
-                                                                                'date': move.date,
-                                                                                })[pricelist]
-            if not price:
-                price = move.product_id.standard_price
-            self.write(cr, uid, [move.id], {'price_unit': price})
+        price = move.product_id.standard_price
+        self.write(cr, uid, [move.id], {'price_unit': price})
 
 
     def action_confirm(self, cr, uid, ids, context=None):
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index e4d58e39bda..c662ec8c9b7 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -97,12 +97,11 @@ class stock_move(osv.osv):
     def _get_master_data(self, cr, uid, move, company, context=None):
         ''' returns a tuple (browse_record(res.partner), ID(res.users), ID(res.currency)'''
         currency = company.currency_id.id
-        if move.partner_id:
-            if move.partner_id.property_product_pricelist_purchase and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal':
-                currency = move.partner_id.property_product_pricelist_purchase.currency_id.id
-            elif move.partner_id.property_product_pricelist and move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal':
-                currency = move.partner_id.property_product_pricelist.currency_id.id
-        return move.picking_id.partner_id, uid, currency
+        partner = move.partner_id or (move.picking_id and move.picking_id.partner_id) or False
+        if partner:
+            if partner.property_product_pricelist and move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal':
+                currency = partner.property_product_pricelist.currency_id.id
+        return partner, uid, currency
 
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
         return self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)

From 82c5aa6774b852fcfe6a0bcdd6048a2cd09fdf65 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 4 Sep 2014 17:54:44 +0200
Subject: [PATCH 05/12] [IMP] Patch for boms that explode in boms to have the
 correct quantities courtesy of chm

---
 addons/mrp/mrp.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2c484808064..c06acff1153 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -324,25 +324,29 @@ class mrp_bom(osv.osv):
                 raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
             all_prod.append(bom_line_id.product_id.id)
             
-            if bom_line_id.type != "phantom":
+            quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
+
+            bom2 = None
+            bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties)
+            if bom_id:
+                bom2 = self.browse(cr, uid, bom_id)  
+
+            if bom_line_id.type != "phantom" and (not bom2 or bom2.type != "phantom"):
                 result.append({
                     'name': bom_line_id.product_id.name,
                     'product_id': bom_line_id.product_id.id,
-                    'product_qty': _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding),
+                    'product_qty': quantity,
                     'product_uom': bom_line_id.product_uom.id,
                     'product_uos_qty': bom_line_id.product_uos and bom_line_id.product_uos_qty * factor or False,
                     'product_uos': bom_line_id.product_uos and bom_line_id.product_uos.id or False,
                 })
+            elif bom2:
+                res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, quantity,
+                    properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom)
+                result = result + res[0]
+                result2 = result2 + res[1]
             else:
-                bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties)
-                if bom_id:
-                    bom2 = self.browse(cr, uid, bom_id)  
-                    res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, factor,
-                        properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom)
-                    result = result + res[0]
-                    result2 = result2 + res[1]
-                else:
-                    raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a phantom BoM line but the product "%s" don\'t have any BoM defined.') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
+                raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a phantom BoM line but the product "%s" don\'t have any BoM defined.') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
 
         return result, result2
 

From 15125343204e2f9f91f1e2f2c34ade40bee80e5f Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Fri, 5 Sep 2014 12:16:09 +0200
Subject: [PATCH 06/12] [FIX] When purchase, do not overwrite price

---
 addons/purchase/stock.py | 4 ++--
 addons/stock/stock.py    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 0875ff88fab..1e26aaa65eb 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -91,7 +91,7 @@ class stock_move(osv.osv):
         """
             Attribute price to move, important in inter-company moves or receipts with only one partner
         """
-        if move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
+        if not move.purchase_line_id and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
             partner = move.partner_id or (move.picking_id and move.picking_id.partner_id)
             price = False
             # If partner given, search price in its purchase pricelist
@@ -105,7 +105,7 @@ class stock_move(osv.osv):
                                                                                 })[pricelist]
                 if price:
                     self.write(cr, uid, [move.id], {'price_unit': price}, context=context)
-                return True
+                    return True
         super(stock_move, self).attribute_price(cr, uid, move, context=context)
 
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 56d525ab158..f033b4d5e6a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2018,8 +2018,9 @@ class stock_move(osv.osv):
         """
             Attribute price to move, important in inter-company moves or receipts with only one partner
         """
-        price = move.product_id.standard_price
-        self.write(cr, uid, [move.id], {'price_unit': price})
+        if not move.price_unit:
+            price = move.product_id.standard_price
+            self.write(cr, uid, [move.id], {'price_unit': price})
 
 
     def action_confirm(self, cr, uid, ids, context=None):

From d38fafdee8fdd4ad1ce3043e5b347317f0b83369 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Fri, 5 Sep 2014 14:50:41 +0200
Subject: [PATCH 07/12] [IMP] Put wkf_action_cancel back, so the method does
 not call itself recursively (issue 2079)

---
 addons/purchase/purchase.py           |  5 +++++
 addons/purchase/purchase_workflow.xml |  2 +-
 addons/purchase/stock.py              |  4 ++--
 addons/stock_account/stock.py         | 14 +++++++-------
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 02296ce4650..69535f703bb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -672,6 +672,11 @@ class purchase_order(osv.osv):
                     return True
         return False
 
+    def wkf_action_cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'cancel'})
+        self.set_order_line_status(cr, uid, ids, 'cancel', context=context)
+
+
     def action_cancel(self, cr, uid, ids, context=None):
         for purchase in self.browse(cr, uid, ids, context=context):
             for pick in purchase.picking_ids:
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 810c0a74064..fe6b5a3f045 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -37,7 +37,7 @@
             <field name="name">cancel</field>
             <field name="kind">function</field>
             <field name="flow_stop">True</field>
-            <field name="action">action_cancel()</field>
+            <field name="action">wkf_action_cancel()</field>
         </record>
         <record id="act_except_invoice" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 1e26aaa65eb..c1ccdd998d5 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -70,7 +70,7 @@ class stock_move(osv.osv):
             purchase_order = move.purchase_line_id.order_id
             return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.currency_id.id
         else:
-            partner = move.partner_id or (move.picking_id and move.picking_id.partner_id) or False
+            partner = move.picking_id and move.picking_id.partner_id or False
             if partner:
                 if partner.property_product_pricelist_purchase and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal':
                     currency = partner.property_product_pricelist_purchase.currency_id.id
@@ -92,7 +92,7 @@ class stock_move(osv.osv):
             Attribute price to move, important in inter-company moves or receipts with only one partner
         """
         if not move.purchase_line_id and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
-            partner = move.partner_id or (move.picking_id and move.picking_id.partner_id)
+            partner = move.picking_id and move.picking_id.partner_id or False
             price = False
             # If partner given, search price in its purchase pricelist
             if partner and partner.property_product_pricelist_purchase:
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index c662ec8c9b7..12f6c76573d 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -97,7 +97,8 @@ class stock_move(osv.osv):
     def _get_master_data(self, cr, uid, move, company, context=None):
         ''' returns a tuple (browse_record(res.partner), ID(res.users), ID(res.currency)'''
         currency = company.currency_id.id
-        partner = move.partner_id or (move.picking_id and move.picking_id.partner_id) or False
+        import pdb; pdb.set_trace()
+        partner = move.picking_id and move.picking_id.partner_id
         if partner:
             if partner.property_product_pricelist and move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal':
                 currency = partner.property_product_pricelist.currency_id.id
@@ -115,12 +116,11 @@ class stock_move(osv.osv):
         if context is None:
             context = {}
         if type in ('in_invoice', 'in_refund'):
-            if move_line.partner_id:
+            if move_line.price_unit:
                 return move_line.price_unit
             else:
-                # Take the user company and pricetype
-                # TODO: This intercompany still needed?
-                product = move_line.product_id.with_context(currency_id=move_line.company_id.currency_id.id)
+                # Take the company of the move line
+                product = move_line.product_id.with_context(company_id=move_line.company_id.id)
                 amount_unit = product.price_get('standard_price')[move_line.product_id.id]
                 return amount_unit
         else:
@@ -129,7 +129,7 @@ class stock_move(osv.osv):
                 pricelist_obj = self.pool.get("product.pricelist")
                 pricelist = move_line.partner_id.property_product_pricelist.id
                 price = pricelist_obj.price_get(cr, uid, [pricelist],
-                        product, move_line.product_uom_qty, move_line.partner_id.id, {
+                        move_line.product_id.id, move_line.product_uom_qty, move_line.partner_id.id, {
                             'uom': move_line.product_uom.id,
                             'date': move_line.date,
                             })[pricelist]
@@ -206,7 +206,7 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")
           ], string="Invoice Control", required=True,
-        fnct_inv = _set_inv_state,
+        #fnct_inv = _set_inv_state,
         store={
             'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10),
             'stock.move': (__get_picking_move, ['picking_id', 'invoice_state'], 10),

From cd462b7c8d182c5e554351d45f652dff33707fa4 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 8 Sep 2014 15:20:01 +0200
Subject: [PATCH 08/12] [IMP] Invoice_state on move and search custom picking
 type

---
 addons/mrp/mrp.py                           | 22 ++++++++++++++++++---
 addons/stock/stock.py                       | 11 +++++++++++
 addons/stock_account/stock.py               |  7 -------
 addons/stock_account/stock_account_view.xml | 10 ++++++++++
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index c06acff1153..5f84cdaf730 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1065,16 +1065,32 @@ class mrp_production(osv.osv):
 
 
 
+
     def _create_previous_move(self, cr, uid, move_id, product, source_location_id, dest_location_id, context=None):
         '''
         When the routing gives a different location than the raw material location of the production order, 
         we should create an extra move from the raw material location to the location of the routing, which 
-        precedes the consumption line (chained)
+        precedes the consumption line (chained).  The picking type depends on the warehouse in which this happens
+        and the type of locations. 
         '''
-        
+        loc_obj = self.pool.get("stock.location")
         stock_move = self.pool.get('stock.move')
         type_obj = self.pool.get('stock.picking.type')
-        types = type_obj.search(cr, uid, [('code','=','outgoing')], context=context)
+        # Need to search for a picking type
+        src_loc = loc_obj.browse(cr, uid, source_location_id, context=context)
+        dest_loc = loc_obj.browse(cr, uid, dest_location_id, context=context)
+        code = 'internal'
+        check_loc = dest_loc
+        if src_loc.usage == 'internal' and dest_loc.usage != 'internal':
+            code = 'outgoing'
+            check_loc = src_loc
+        if src_loc.usage != 'internal' and dest_loc.usage == 'internal':
+            code = 'incoming'
+        wh = loc_obj.get_warehouse(cr, uid, check_loc, context=context)
+        domain = [('code','=', code)]
+        if wh: 
+            domain += [('warehouse_id', '=', wh)]
+        types = type_obj.search(cr, uid, domain, context=context)
         move = stock_move.copy(cr, uid, move_id, default = {
             'location_id': source_location_id,
             'location_dest_id': dest_location_id,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f033b4d5e6a..9b9d8a5c0d9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -189,6 +189,16 @@ class stock_location(osv.osv):
         return self._default_removal_strategy(cr, uid, context=context)
 
 
+    def get_warehouse(self, cr, uid, location, context=None):
+        """
+            Returns warehouse id of warehouse that contains location
+            :param location: browse record (stock.location)
+        """
+        wh_obj = self.pool.get("stock.warehouse")
+        whs = wh_obj.search(cr, uid, [('view_location_id.parent_left', '<=', location.parent_left), 
+                                ('view_location_id.parent_right', '>=', location.parent_left)], context=context)
+        return whs and whs[0] or False
+
 #----------------------------------------------------------
 # Routes
 #----------------------------------------------------------
@@ -3460,6 +3470,7 @@ class stock_warehouse(osv.osv):
             'limit': 20
         }
 
+
 class stock_location_path(osv.osv):
     _name = "stock.location.path"
     _description = "Pushed Flows"
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index 12f6c76573d..f1a3680eca7 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -97,7 +97,6 @@ class stock_move(osv.osv):
     def _get_master_data(self, cr, uid, move, company, context=None):
         ''' returns a tuple (browse_record(res.partner), ID(res.users), ID(res.currency)'''
         currency = company.currency_id.id
-        import pdb; pdb.set_trace()
         partner = move.picking_id and move.picking_id.partner_id
         if partner:
             if partner.property_product_pricelist and move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal':
@@ -193,11 +192,6 @@ class stock_picking(osv.osv):
                 res.append(move.picking_id.id)
         return res
 
-    def _set_inv_state(self, cr, uid, picking_id, name, value, arg, context=None):
-        pick = self.browse(cr, uid, picking_id, context=context)
-        moves = [x.id for x in pick.move_lines]
-        move_obj= self.pool.get("stock.move")
-        move_obj.write(cr, uid, moves, {'invoice_state': pick.invoice_state})
 
 
     _columns = {
@@ -206,7 +200,6 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")
           ], string="Invoice Control", required=True,
-        #fnct_inv = _set_inv_state,
         store={
             'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10),
             'stock.move': (__get_picking_move, ['picking_id', 'invoice_state'], 10),
diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index dbce1a96bdd..a3dd6260189 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -82,5 +82,15 @@
                 </xpath>
             </field>
         </record>
+        <record model="ir.ui.view" id="view_move_picking_from_stockaccount_inherit">
+            <field name="name">stock.move.form.invoice_state</field>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_picking_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='date_expected']" position="after">
+                    <field name="invoice_state" groups="account.group_account_invoice"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>

From ec8703b38b6b823e7247dcc61e14c68515c34b04 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 8 Sep 2014 18:00:50 +0200
Subject: [PATCH 09/12] [WIP] Improve views for qty available + forecast qty in
 product and product template tree views

---
 addons/stock/product_view.xml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 3ef1e744245..f889f09048c 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -10,9 +10,10 @@
                 <tree position="attributes">
                     <attribute name="colors">{'red':virtual_available&lt;0, 'blue':virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete'), 'black':virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')}</attribute>
                 </tree>
-                <tree position="inside">
-                    <field name="virtual_available" invisible="1"/>
-                </tree>
+                <field name="price" position="after">
+                    <field name="qty_available"/>
+                    <field name="virtual_available"/>
+                </field>
             </field>
         </record>
 
@@ -24,9 +25,10 @@
                 <tree position="attributes">
                     <attribute name="colors">{'red':virtual_available&lt;0, 'blue':virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete'), 'black':virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')}</attribute>
                 </tree>
-                <tree position="inside">
-                    <field name="virtual_available" invisible="1"/>
-                </tree>
+                <field name="uom_id" position="after">
+                    <field name="qty_available"/>
+                    <field name="virtual_available"/>
+                </field>
             </field>
         </record>
 
@@ -247,5 +249,21 @@
                 </xpath>
             </field>
         </record>
+        
+        
+        <act_window
+            context="{'location': active_id}"
+            domain="[('type','&lt;&gt;','service')]"
+            id="act_product_location_open"
+            name="Products"
+            res_model="product.product"
+            src_model="stock.location"/>
+
+        <record id="ir_act_product_location_open" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">stock.location</field>
+            <field name="name">Products</field>
+            <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
+        </record>
     </data>
 </openerp>

From ae2eb43e30e1b1c555b5e952cdacbc2a601f66b1 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 9 Sep 2014 19:06:26 +0200
Subject: [PATCH 10/12] [IMP] Implement comments on pull request

---
 addons/mrp/mrp.py                          | 61 +++++++++-------------
 addons/mrp/procurement.py                  |  4 +-
 addons/mrp/report/price.py                 |  4 +-
 addons/mrp/stock.py                        |  2 +-
 addons/mrp/wizard/change_production_qty.py |  4 +-
 addons/product/product.py                  | 39 --------------
 addons/purchase/purchase.py                |  3 +-
 addons/purchase/stock.py                   | 16 +++---
 addons/sale_stock/sale_stock.py            |  1 +
 addons/stock/product_view.xml              | 22 ++------
 addons/stock/stock.py                      | 17 +++++-
 addons/stock/stock_view.xml                | 13 +++++
 addons/stock_account/stock.py              | 18 +++----
 13 files changed, 83 insertions(+), 121 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5f84cdaf730..bc5b7608eec 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -230,7 +230,7 @@ class mrp_bom(osv.osv):
     }
     _order = "sequence"
 
-    def _bom_find(self, cr, uid, product_uom, product_tmpl_id=None, product_id=None, properties=None):
+    def _bom_find(self, cr, uid, product_uom, product_tmpl_id=None, product_id=None, properties=None, context=None):
         """ Finds BoM for particular product and product uom.
         @param product_tmpl_id: Selected product.
         @param product_uom: Unit of measure of a product.
@@ -241,7 +241,7 @@ class mrp_bom(osv.osv):
             properties = []
         if product_id:
             if not product_tmpl_id:
-                product_tmpl_id = self.pool['product.product'].browse(cr, uid, product_id).product_tmpl_id.id
+                product_tmpl_id = self.pool['product.product'].browse(cr, uid, product_id, context=context).product_tmpl_id.id
             domain = [
                 '|',
                     ('product_id', '=', product_id),
@@ -255,21 +255,21 @@ class mrp_bom(osv.osv):
             # neither product nor template, makes no sense to search
             return False
         if product_uom:
-            domain +=  [('product_uom','=',product_uom)]
+            domain += [('product_uom','=',product_uom)]
         domain = domain + [ '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
                             '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
         # order to prioritize bom with product_id over the one without
         ids = self.search(cr, uid, domain, order='product_id')
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):
-            if not set(map(int,bom.property_ids or [])) - set(properties or []):
+            if not set(map(int, bom.property_ids or [])) - set(properties or []):
                 return bom.id
         return False
 
-    def _bom_explode(self, cr, uid, bom, product, factor, properties=None, level=0, routing_id=False, previous_products=None, master_bom=None):
+    def _bom_explode(self, cr, uid, bom, product, factor, properties=None, level=0, routing_id=False, previous_products=None, master_bom=None, context=None):
         """ Finds Products and Work Centers for related BoM for manufacturing order.
         @param bom: BoM of particular product template.
         @param product: Select a particular variant of the BoM. If False use BoM without variants.
-        @param factor: Factor of product UoM.
+        @param factor: Factor represents the quantity, but in UoM of the BoM, taking into account the numbers produced by the BoM
         @param properties: A List of properties Ids.
         @param level: Depth level to find BoM lines starts from 10.
         @param previous_products: List of product previously use by bom explore to avoid recursion
@@ -312,9 +312,6 @@ class mrp_bom(osv.osv):
             if bom_line_id.date_start and bom_line_id.date_start > time.strftime(DEFAULT_SERVER_DATETIME_FORMAT) or \
                 bom_line_id.date_stop and bom_line_id.date_stop > time.strftime(DEFAULT_SERVER_DATETIME_FORMAT):
                     continue
-            # check properties
-            if set(map(int,bom_line_id.property_ids or [])) - set(properties or []):
-                continue
             # all bom_line_id variant values must be in the product
             if bom_line_id.attribute_value_ids:
                 if not product or (set(map(int,bom_line_id.attribute_value_ids or [])) - set(map(int,product.attribute_value_ids))):
@@ -323,26 +320,25 @@ class mrp_bom(osv.osv):
             if bom_line_id.product_id.id in all_prod:
                 raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
             all_prod.append(bom_line_id.product_id.id)
-            
-            quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
 
-            bom2 = None
-            bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties)
-            if bom_id:
-                bom2 = self.browse(cr, uid, bom_id)  
 
-            if bom_line_id.type != "phantom" and (not bom2 or bom2.type != "phantom"):
+            bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties, context=context)
+
+            #If BoM should not behave like PhantoM, just add the product, otherwise explode further
+            if bom_line_id.type != "phantom" and (not bom_id or self.browse(cr, uid, bom_id, context=context).type != "phantom"):
                 result.append({
                     'name': bom_line_id.product_id.name,
                     'product_id': bom_line_id.product_id.id,
-                    'product_qty': quantity,
+                    'product_qty': bom_line_id.product_qty * factor,
                     'product_uom': bom_line_id.product_uom.id,
                     'product_uos_qty': bom_line_id.product_uos and bom_line_id.product_uos_qty * factor or False,
                     'product_uos': bom_line_id.product_uos and bom_line_id.product_uos.id or False,
                 })
-            elif bom2:
+            elif bom_id:
+                bom2 = self.browse(cr, uid, bom_id, context=context)
+                quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
                 res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, quantity,
-                    properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom)
+                    properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom, context=context)
                 result = result + res[0]
                 result2 = result2 + res[1]
             else:
@@ -646,7 +642,7 @@ class mrp_production(osv.osv):
             }}
         bom_obj = self.pool.get('mrp.bom')
         product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-        bom_id = bom_obj._bom_find(cr, uid, product.uom_id and product.uom_id.id, product_id=product.id, properties=[])
+        bom_id = bom_obj._bom_find(cr, uid, product.uom_id and product.uom_id.id, product_id=product.id, properties=[], context=context)
         routing_id = False
         if bom_id:
             bom_point = bom_obj.browse(cr, uid, bom_id, context=context)
@@ -695,7 +691,7 @@ class mrp_production(osv.osv):
             bom_point = production.bom_id
             bom_id = production.bom_id.id
             if not bom_point:
-                bom_id = bom_obj._bom_find(cr, uid, production.product_uom.id, product_id=production.product_id.id, properties=properties)
+                bom_id = bom_obj._bom_find(cr, uid, production.product_uom.id, product_id=production.product_id.id, properties=properties, context=context)
                 if bom_id:
                     bom_point = bom_obj.browse(cr, uid, bom_id)
                     routing_id = bom_point.routing_id.id or False
@@ -707,7 +703,7 @@ class mrp_production(osv.osv):
             # get components and workcenter_lines from BoM structure
             factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
             # product_lines, workcenter_lines
-            results, results2 = bom_obj._bom_explode(cr, uid, bom_point, production.product_id, factor / bom_point.product_qty, properties, routing_id=production.routing_id.id)
+            results, results2 = bom_obj._bom_explode(cr, uid, bom_point, production.product_id, factor / bom_point.product_qty, properties, routing_id=production.routing_id.id, context=context)
             # reset product_lines in production order
             for line in results:
                 line['production_id'] = production.id
@@ -1063,9 +1059,6 @@ class mrp_production(osv.osv):
             return "make_to_order"
         return "make_to_stock"
 
-
-
-
     def _create_previous_move(self, cr, uid, move_id, product, source_location_id, dest_location_id, context=None):
         '''
         When the routing gives a different location than the raw material location of the production order, 
@@ -1077,17 +1070,15 @@ class mrp_production(osv.osv):
         stock_move = self.pool.get('stock.move')
         type_obj = self.pool.get('stock.picking.type')
         # Need to search for a picking type
-        src_loc = loc_obj.browse(cr, uid, source_location_id, context=context)
-        dest_loc = loc_obj.browse(cr, uid, dest_location_id, context=context)
-        code = 'internal'
-        check_loc = dest_loc
-        if src_loc.usage == 'internal' and dest_loc.usage != 'internal':
-            code = 'outgoing'
-            check_loc = src_loc
-        if src_loc.usage != 'internal' and dest_loc.usage == 'internal':
-            code = 'incoming'
+        move = stock_move.browse(cr, uid, move_id, context=context)
+        code = stock_move.get_code_from_locs(cr, uid, move, context=context)
+        if code == 'outgoing':
+            check_loc_id = source_location_id
+        else:
+            check_loc_id = dest_location_id
+        check_loc = loc_obj.browse(cr, uid, check_loc_id, context=context)
         wh = loc_obj.get_warehouse(cr, uid, check_loc, context=context)
-        domain = [('code','=', code)]
+        domain = [('code', '=', code)]
         if wh: 
             domain += [('warehouse_id', '=', wh)]
         types = type_obj.search(cr, uid, domain, context=context)
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 06eacc6a1a2..ec175273d10 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -63,7 +63,7 @@ class procurement_order(osv.osv):
         for procurement in self.browse(cr, uid, ids, context=context):
             properties = [x.id for x in procurement.property_ids]
             bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_uom.id,
-                product_id=procurement.product_id.id, properties=properties)
+                product_id=procurement.product_id.id, properties=properties, context=context)
             if not bom_id:
                 return False
         return True
@@ -85,7 +85,7 @@ class procurement_order(osv.osv):
                 else:
                     properties = [x.id for x in procurement.property_ids]
                     bom_id = bom_obj._bom_find(cr, uid, procurement.product_uom.id,
-                        product_id=procurement.product_id.id, properties=properties)
+                        product_id=procurement.product_id.id, properties=properties, context=context)
                     bom = bom_obj.browse(cr, uid, bom_id, context=context)
                     routing_id = bom.routing_id.id
 
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 0071784eed4..9e818001d15 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -144,7 +144,7 @@ class report_custom(report_rml):
 
         for product in product_pool.browse(cr, uid, ids, context=context):
             product_uom_name = to_xml(product.uom_id.name)
-            bom_id = bom_pool._bom_find(cr, uid, product.uom_id.id, product_id=product.id)
+            bom_id = bom_pool._bom_find(cr, uid, product.uom_id.id, product_id=product.id, context=context)
             title = "<title>%s</title>" %(_("Cost Structure"))
             title += "<title>%s</title>" % (to_xml(product.name))
             xml += "<lines style='header'>" + title + prod_header + "</lines>"
@@ -168,7 +168,7 @@ class report_custom(report_rml):
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
                 factor = number * product.uom_id.factor / bom.product_uom.factor
-                sub_boms = bom_pool._bom_explode(cr, uid, bom, product, factor / bom.product_qty)
+                sub_boms = bom_pool._bom_explode(cr, uid, bom, product, factor / bom.product_qty, context=context)
                 total = 0
                 total_strd = 0
                 parent_bom = {
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index fcd2ae66cef..f472abe4b71 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -73,7 +73,7 @@ class StockMove(osv.osv):
         if bis:
             factor = move.product_qty
             bom_point = bom_obj.browse(cr, SUPERUSER_ID, bis[0], context=context)
-            res = bom_obj._bom_explode(cr, SUPERUSER_ID, bom_point, move.product_id, factor, [])
+            res = bom_obj._bom_explode(cr, SUPERUSER_ID, bom_point, move.product_id, factor, [], context=context)
             
             state = 'confirmed'
             if move.state == 'assigned':
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 6b1c9aaf7e8..44eed63d029 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -78,7 +78,7 @@ class change_production_qty(osv.osv_memory):
                 bom_point = prod.bom_id
                 bom_id = prod.bom_id.id
                 if not bom_point:
-                    bom_id = bom_obj._bom_find(cr, uid, prod.product_uom.id, product_id=prod.product_id.id)
+                    bom_id = bom_obj._bom_find(cr, uid, prod.product_uom.id, product_id=prod.product_id.id, context=context)
                     if not bom_id:
                         raise osv.except_osv(_('Error!'), _("Cannot find bill of material for this product."))
                     prod_obj.write(cr, uid, [prod.id], {'bom_id': bom_id})
@@ -89,7 +89,7 @@ class change_production_qty(osv.osv_memory):
 
                 factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
                 product_details, workcenter_details = \
-                    bom_obj._bom_explode(cr, uid, bom_point, prod.product_id, factor / bom_point.product_qty, [])
+                    bom_obj._bom_explode(cr, uid, bom_point, prod.product_id, factor / bom_point.product_qty, [], context=context)
                 for r in product_details:
                     if r['product_id'] == move.product_id.id:
                         move_obj.write(cr, uid, [move.id], {'product_uom_qty': r['product_qty']})
diff --git a/addons/product/product.py b/addons/product/product.py
index 009377c7221..cc8d1affb3a 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -1190,46 +1190,7 @@ class product_supplierinfo(osv.osv):
         'delay': 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
     }
-    def price_get(self, cr, uid, supplier_ids, product_id, product_qty=1, context=None):
-        """
-        Calculate price from supplier pricelist.
-        @param supplier_ids: Ids of res.partner object.
-        @param product_id: Id of product.
-        @param product_qty: specify quantity to purchase.
-        """
-        if type(supplier_ids) in (int,long,):
-            supplier_ids = [supplier_ids]
-        res = {}
-        product_pool = self.pool.get('product.product')
-        partner_pool = self.pool.get('res.partner')
-        pricelist_pool = self.pool.get('product.pricelist')
-        currency_pool = self.pool.get('res.currency')
-        currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
-        # Compute price from standard price of product
-        product_price = product_pool.price_get(cr, uid, [product_id], 'standard_price', context=context)[product_id]
-        product = product_pool.browse(cr, uid, product_id, context=context)
-        for supplier in partner_pool.browse(cr, uid, supplier_ids, context=context):
-            price = product_price
-            # Compute price from Purchase pricelist of supplier
-            #FIXME: property_product_pricelist_purchase is defined in purchase
-            pricelist_id = supplier.property_product_pricelist_purchase.id
-            if pricelist_id:
-                price = pricelist_pool.price_get(cr, uid, [pricelist_id], product_id, product_qty, context=context).setdefault(pricelist_id, 0)
-                price = currency_pool.compute(cr, uid, pricelist_pool.browse(cr, uid, pricelist_id).currency_id.id, currency_id, price)
 
-            # Compute price from supplier pricelist which are in Supplier Information
-            supplier_info_ids = self.search(cr, uid, [('name','=',supplier.id),('product_tmpl_id','=',product.product_tmpl_id.id)])
-            if supplier_info_ids:
-                cr.execute('SELECT * ' \
-                    'FROM pricelist_partnerinfo ' \
-                    'WHERE suppinfo_id IN %s' \
-                    'AND min_quantity <= %s ' \
-                    'ORDER BY min_quantity DESC LIMIT 1', (tuple(supplier_info_ids),product_qty,))
-                res2 = cr.dictfetchone()
-                if res2:
-                    price = res2['price']
-            res[supplier.id] = price
-        return res
     _order = 'sequence'
 
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 69535f703bb..be2803261e7 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -673,10 +673,9 @@ class purchase_order(osv.osv):
         return False
 
     def wkf_action_cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'cancel'})
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
         self.set_order_line_status(cr, uid, ids, 'cancel', context=context)
 
-
     def action_cancel(self, cr, uid, ids, context=None):
         for purchase in self.browse(cr, uid, ids, context=context):
             for pick in purchase.picking_ids:
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index c1ccdd998d5..320e35c2ffa 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -71,10 +71,10 @@ class stock_move(osv.osv):
             return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.currency_id.id
         else:
             partner = move.picking_id and move.picking_id.partner_id or False
-            if partner:
-                if partner.property_product_pricelist_purchase and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal':
-                    currency = partner.property_product_pricelist_purchase.currency_id.id
-                    return partner, uid, currency
+            code = self.get_code_from_locs(cr, uid, move, context=context)
+            if partner and partner.property_product_pricelist_purchase and code == 'incoming':
+                currency = partner.property_product_pricelist_purchase.currency_id.id
+                return partner, uid, currency
         return super(stock_move, self)._get_master_data(cr, uid, move, company, context=context)
 
 
@@ -91,7 +91,8 @@ class stock_move(osv.osv):
         """
             Attribute price to move, important in inter-company moves or receipts with only one partner
         """
-        if not move.purchase_line_id and move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and not move.price_unit:
+        code = self.get_code_from_locs(cr, uid, move, context=context)
+        if not move.purchase_line_id and code == 'incoming' and not move.price_unit:
             partner = move.picking_id and move.picking_id.partner_id or False
             price = False
             # If partner given, search price in its purchase pricelist
@@ -104,12 +105,10 @@ class stock_move(osv.osv):
                                                                                 'date': move.date,
                                                                                 })[pricelist]
                 if price:
-                    self.write(cr, uid, [move.id], {'price_unit': price}, context=context)
-                    return True
+                    return self.write(cr, uid, [move.id], {'price_unit': price}, context=context)
         super(stock_move, self).attribute_price(cr, uid, move, context=context)
 
 
-
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
     
@@ -167,7 +166,6 @@ class stock_warehouse(osv.osv):
             'route_id': buy_route_id,
             'action': 'buy',
             'picking_type_id': warehouse.in_type_id.id,
-            'propagate': False, 
             'warehouse_id': warehouse.id,
         }
 
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 7fef11b7472..0d0a147e324 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -288,6 +288,7 @@ class sale_order_line(osv.osv):
         product_uom_obj = self.pool.get('product.uom')
         product_obj = self.pool.get('product.product')
         warning = {}
+        #UoM False due to hack which makes sure uom changes price, ... in product_id_change
         res = self.product_id_change(cr, uid, ids, pricelist, product, qty=qty,
             uom=False, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index f889f09048c..e3612010a80 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -84,8 +84,10 @@
                     <separator/>
                     <filter name="real_stock_available" string="Available Products" domain="[('qty_available','&gt;',0)]"/>
                     <filter name="virtual_stock_available" string="Forecast Available Products" domain="[('virtual_available','&gt;',0)]"/>
-                    <filter name="real_stock_negative" string="Exhausted Stock" domain="[('qty_available','&lt;=',0)]"/>
-                    <filter name="virtual_stock_negative" string="Forecast Exhausted Stock" domain="[('virtual_available','&lt;=',0)]"/>
+                    <filter name="real_stock_exhausted" string="Exhausted Stock" domain="[('qty_available','&lt;=',0)]"/>
+                    <filter name="virtual_stock_exhausted" string="Forecast Exhausted Stock" domain="[('virtual_available','&lt;=',0)]"/>
+                    <filter name="real_stock_negative" string="Negative Stock" domain="[('qty_available','&lt;',0)]"/>
+                    <filter name="virtual_stock_negative" string="Forecast Negative Stock" domain="[('virtual_available','&lt;',0)]"/>
                 </field>
                 <filter name="consumable" position="before">
                    <filter string="Products" icon="terp-accessories-archiver" domain="[('type','=','product')]" help="Stockable products"/>
@@ -249,21 +251,5 @@
                 </xpath>
             </field>
         </record>
-        
-        
-        <act_window
-            context="{'location': active_id}"
-            domain="[('type','&lt;&gt;','service')]"
-            id="act_product_location_open"
-            name="Products"
-            res_model="product.product"
-            src_model="stock.location"/>
-
-        <record id="ir_act_product_location_open" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">stock.location</field>
-            <field name="name">Products</field>
-            <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9b9d8a5c0d9..815caeb3bb9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2032,7 +2032,6 @@ class stock_move(osv.osv):
             price = move.product_id.standard_price
             self.write(cr, uid, [move.id], {'price_unit': price})
 
-
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms stock move or put it in waiting if it's linked to another move.
         @return: List of ids.
@@ -2443,6 +2442,21 @@ class stock_move(osv.osv):
         return self.action_confirm(cr, uid, [new_move], context=context)[0]
 
 
+    def get_code_from_locs(self, cr, uid, move, context=None):
+        """
+        Returns the code the picking type should have.  This can easily be used
+        to check if a move is internal or not
+        """
+        code = 'internal'
+        src_loc = move.location_id
+        dest_loc = move.location_dest_id
+        if src_loc.usage == 'internal' and dest_loc.usage != 'internal':
+            code = 'outgoing'
+        if src_loc.usage != 'internal' and dest_loc.usage == 'internal':
+            code = 'incoming'
+        return code
+
+
 class stock_inventory(osv.osv):
     _name = "stock.inventory"
     _description = "Inventory"
@@ -3531,7 +3545,6 @@ class stock_location_path(osv.osv):
                 'push_rule_id': rule.id,
                 'warehouse_id': rule.warehouse_id and rule.warehouse_id.id or False,
             }
-        
 
     def _apply(self, cr, uid, rule, move, context=None):
         move_obj = self.pool.get('stock.move')
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6b72f9976df..2f154b03d92 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -306,6 +306,14 @@
             <field name="res_model">stock.quant</field>
         </record>
 
+        <act_window
+            context="{'location': active_id, 'search_default_real_stock_available': 1, 'search_default_virtual_stock_available': 1,
+                        'search_default_virtual_stock_negative': 1, 'search_default_real_stock_negative': 1}"
+            id="act_product_location_open"
+            name="Products"
+            res_model="product.product"
+            src_model="stock.location"/>
+
         <record id="view_location_form" model="ir.ui.view">
             <field name="name">stock.location.form</field>
             <field name="model">stock.location</field>
@@ -316,6 +324,11 @@
                                 class="oe_stat_button" 
                                 icon="fa-building-o" name="%(location_open_quants)d" type="action"
                                 context="{'search_default_internal_loc': 1}"/>
+                        <button string="Products"
+                                class="oe_stat_button"
+                                icon="fa-filter" name="%(act_product_location_open)d" type="action"
+                                context="{'location_id': active_id}"
+                                />
                     </div>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index f1a3680eca7..555ced13758 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -99,7 +99,8 @@ class stock_move(osv.osv):
         currency = company.currency_id.id
         partner = move.picking_id and move.picking_id.partner_id
         if partner:
-            if partner.property_product_pricelist and move.location_id.usage == 'internal' and move.location_dest_id.usage != 'internal':
+            code = self.get_code_from_locs(cr, uid, move, context=context)
+            if partner.property_product_pricelist and code == 'outgoing':
                 currency = partner.property_product_pricelist.currency_id.id
         return partner, uid, currency
 
@@ -115,13 +116,7 @@ class stock_move(osv.osv):
         if context is None:
             context = {}
         if type in ('in_invoice', 'in_refund'):
-            if move_line.price_unit:
-                return move_line.price_unit
-            else:
-                # Take the company of the move line
-                product = move_line.product_id.with_context(company_id=move_line.company_id.id)
-                amount_unit = product.price_get('standard_price')[move_line.product_id.id]
-                return amount_unit
+            return move_line.price_unit
         else:
             # If partner given, search price in its sale pricelist
             if move_line.partner_id and move_line.partner_id.property_product_pricelist:
@@ -192,7 +187,11 @@ class stock_picking(osv.osv):
                 res.append(move.picking_id.id)
         return res
 
-
+    def _set_inv_state(self, cr, uid, picking_id, name, value, arg, context=None):
+        pick = self.browse(cr, uid, picking_id, context=context)
+        moves = [x.id for x in pick.move_lines]
+        move_obj= self.pool.get("stock.move")
+        move_obj.write(cr, uid, moves, {'invoice_state': pick.invoice_state})
 
     _columns = {
         'invoice_state': fields.function(__get_invoice_state, type='selection', selection=[
@@ -200,6 +199,7 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")
           ], string="Invoice Control", required=True,
+        fnct_inv = _set_inv_state,
         store={
             'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10),
             'stock.move': (__get_picking_move, ['picking_id', 'invoice_state'], 10),

From aabebbbc6c80a82d533924cd05bd4e685a5285d1 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 10 Sep 2014 19:11:21 +0200
Subject: [PATCH 11/12] [FIX] Bom qty

---
 addons/mrp/mrp.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index bc5b7608eec..83794c2c4ba 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -321,7 +321,7 @@ class mrp_bom(osv.osv):
                 raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
             all_prod.append(bom_line_id.product_id.id)
 
-
+            quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
             bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties, context=context)
 
             #If BoM should not behave like PhantoM, just add the product, otherwise explode further
@@ -329,14 +329,13 @@ class mrp_bom(osv.osv):
                 result.append({
                     'name': bom_line_id.product_id.name,
                     'product_id': bom_line_id.product_id.id,
-                    'product_qty': bom_line_id.product_qty * factor,
+                    'product_qty': quantity,
                     'product_uom': bom_line_id.product_uom.id,
                     'product_uos_qty': bom_line_id.product_uos and bom_line_id.product_uos_qty * factor or False,
                     'product_uos': bom_line_id.product_uos and bom_line_id.product_uos.id or False,
                 })
             elif bom_id:
                 bom2 = self.browse(cr, uid, bom_id, context=context)
-                quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
                 res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, quantity,
                     properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom, context=context)
                 result = result + res[0]

From df655f00a3a7ad9fb3454862df3afec585ccbe3b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 11 Sep 2014 16:02:44 +0200
Subject: [PATCH 12/12] [IMP] Solve landed costs bug + invoice_state in
 account_anglo_saxon.yml

---
 .../account_anglo_saxon/test/anglo_saxon.yml  |  2 +-
 .../test/anglo_saxon_avg_fifo.yml             |  2 +-
 addons/mrp/mrp.py                             | 10 ++++++---
 addons/mrp/stock.py                           |  5 +++--
 .../test/stock_invoice_directly.yml           |  2 +-
 .../stock_landed_costs/stock_landed_costs.py  | 22 ++++++++-----------
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/account_anglo_saxon/test/anglo_saxon.yml b/addons/account_anglo_saxon/test/anglo_saxon.yml
index 32f5fd12dee..6733f8794a0 100644
--- a/addons/account_anglo_saxon/test/anglo_saxon.yml
+++ b/addons/account_anglo_saxon/test/anglo_saxon.yml
@@ -198,8 +198,8 @@
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
         location_dest_id: stock.stock_location_customers
-        invoice_state: 2binvoiced
     move_type: direct
+    invoice_state: 2binvoiced
     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.
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 daeefc09730..5762ee128d1 100644
--- a/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
+++ b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
@@ -200,7 +200,7 @@
         product_id: product_fifo_anglo_saxon
         product_uom_qty: 1.0
         location_dest_id: stock.stock_location_customers
-        invoice_state: 2binvoiced
+    invoice_state: 2binvoiced
     move_type: direct
     picking_type_id: stock.picking_type_out
 -
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 83794c2c4ba..850f8c22eda 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -277,6 +277,7 @@ class mrp_bom(osv.osv):
         @return: result: List of dictionaries containing product details.
                  result2: List of dictionaries containing Work Center details.
         """
+        uom_obj = self.pool.get("product.uom")
         routing_obj = self.pool.get('mrp.routing')
         all_prod = [] + (previous_products or [])
         master_bom = master_bom or bom
@@ -319,7 +320,6 @@ class mrp_bom(osv.osv):
 
             if bom_line_id.product_id.id in all_prod:
                 raise osv.except_osv(_('Invalid Action!'), _('BoM "%s" contains a BoM line with a product recursion: "%s".') % (master_bom.name,bom_line_id.product_id.name_get()[0][1]))
-            all_prod.append(bom_line_id.product_id.id)
 
             quantity = _factor(bom_line_id.product_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding)
             bom_id = self._bom_find(cr, uid, bom_line_id.product_uom.id, product_id=bom_line_id.product_id.id, properties=properties, context=context)
@@ -331,12 +331,16 @@ class mrp_bom(osv.osv):
                     'product_id': bom_line_id.product_id.id,
                     'product_qty': quantity,
                     'product_uom': bom_line_id.product_uom.id,
-                    'product_uos_qty': bom_line_id.product_uos and bom_line_id.product_uos_qty * factor or False,
+                    'product_uos_qty': bom_line_id.product_uos and _factor(bom_line_id.product_uos_qty * factor, bom_line_id.product_efficiency, bom_line_id.product_rounding) or False,
                     'product_uos': bom_line_id.product_uos and bom_line_id.product_uos.id or False,
                 })
             elif bom_id:
+                all_prod.append(bom_line_id.product_id.id)
                 bom2 = self.browse(cr, uid, bom_id, context=context)
-                res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, quantity,
+                # We need to convert to units/UoM of chosen BoM
+                factor2 = uom_obj._compute_qty(cr, uid, bom_line_id.product_uom.id, quantity, bom2.product_uom.id)
+                quantity2 = factor2 / bom2.product_qty
+                res = self._bom_explode(cr, uid, bom2, bom_line_id.product_id, quantity2,
                     properties=properties, level=level + 10, previous_products=all_prod, master_bom=master_bom, context=context)
                 result = result + res[0]
                 result2 = result2 + res[1]
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index f472abe4b71..e8613e7fb8e 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -67,12 +67,13 @@ class StockMove(osv.osv):
         move_obj = self.pool.get('stock.move')
         prod_obj = self.pool.get("product.product")
         proc_obj = self.pool.get("procurement.order")
+        uom_obj = self.pool.get("product.uom")
         to_explode_again_ids = []
         processed_ids = []
         bis = self._check_phantom_bom(cr, uid, move, context=context)
         if bis:
-            factor = move.product_qty
             bom_point = bom_obj.browse(cr, SUPERUSER_ID, bis[0], context=context)
+            factor = uom_obj._compute_qty(cr, SUPERUSER_ID, move.product_uom.id, move.product_uom_qty, bom_point.product_uom.id) / bom_point.product_qty
             res = bom_obj._bom_explode(cr, SUPERUSER_ID, bom_point, move.product_id, factor, [], context=context)
             
             state = 'confirmed'
@@ -91,7 +92,7 @@ class StockMove(osv.osv):
                         'state': state,
                         'name': line['name'],
                         'procurement_id': move.procurement_id.id,
-                        'split_from': move.id, #Needed in order to keep purchase connection, but will be removed by unlink
+                        'split_from': move.id, #Needed in order to keep sale connection, but will be removed by unlink
                     }
                     mid = move_obj.copy(cr, uid, move.id, default=valdef, context=context)
                     to_explode_again_ids.append(mid)
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index f2c79bd5e52..1e352b42462 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -13,7 +13,7 @@
         product_uom_qty: 3.0
         product_uom: product.product_uom_unit
         location_dest_id: stock.stock_location_customers
-        invoice_state: 2binvoiced
+    invoice_state: 2binvoiced
     move_type: direct
     picking_type_id: stock.picking_type_out
 -
diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index b4c350a229a..1952194387c 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -184,21 +184,17 @@ class stock_landed_cost(osv.osv):
             total_weight = 0.0
             total_volume = 0.0
             total_line = 0.0
-            for line in cost.cost_lines:
-                vals = self.get_valuation_lines(cr, uid, [cost.id], picking_ids=picking_ids, context=context)
-                for v in vals:
+            vals = self.get_valuation_lines(cr, uid, [cost.id], picking_ids=picking_ids, context=context)
+            for v in vals:
+                for line in cost.cost_lines:
                     v.update({'cost_id': cost.id, 'cost_line_id': line.id})
                     self.pool.get('stock.valuation.adjustment.lines').create(cr, uid, v, context=context)
-                    if line.split_method == 'by_quantity':
-                        total_qty += v.get('quantity', 0.0)
-                    elif line.split_method == 'by_current_cost_price':
-                        total_cost += v.get('former_cost', 0.0)
-                    elif line.split_method == 'by_weight':
-                        total_weight += v.get('weight', 0.0)
-                    elif line.split_method == 'by_volume':
-                        total_volume += v.get('volume', 0.0)
-                    else:
-                        total_line += 1
+                total_qty += v.get('quantity', 0.0)
+                total_cost += v.get('former_cost', 0.0)
+                total_weight += v.get('weight', 0.0)
+                total_volume += v.get('volume', 0.0)
+                total_line += 1
+
             for line in cost.cost_lines:
                 for valuation in cost.valuation_adjustment_lines:
                     value = 0.0