[MERGE] Merge from trunk-wms-loconopmerge2 + only keep good optims

bzr revid: jco@openerp.com-20140313170620-fq25a32fdlo3xrxy

diff --cc addons/mail/mail_message.py
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/stock/stock.py
index 7f10392,4d88dac..ff4ff7c
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -30,9 -30,10 +30,9 @@@ from openerp.tools import DEFAULT_SERVE
  from openerp import SUPERUSER_ID
  import openerp.addons.decimal_precision as dp
  import logging
- _logger = logging.getLogger(__name__)
  
 -# from profilehooks import profile
  
+ _logger = logging.getLogger(__name__)
  #----------------------------------------------------------
  # Incoterms
  #----------------------------------------------------------
@@@ -306,6 -307,10 +306,7 @@@ class stock_quant(osv.osv)
          :param link: browse record (stock.move.operation.link)
          '''
          toreserve = []
 -        if not qty_assigned_before:
 -            reserved_availability = move.reserved_availability
 -        else:
 -            reserved_availability = qty_assigned_before
++        reserved_availability = move.reserved_availability
          #split quants if needed
          for quant, qty in quants:
              if qty <= 0.0 or (quant and quant.qty <= 0.0):
@@@ -537,8 -556,8 +552,6 @@@
          else:
              domain += [('company_id', '=', self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id)]
          #don't take into account location that are production, supplier or inventory
-         ignore_location_ids = self.pool.get('stock.location').search(cr, uid, [('usage', 'in', ('production', 'supplier', 'inventory'))], context=context)
-         domain.append(('location_id','not in',ignore_location_ids))
 -        #ignore_location_ids = self.pool.get('stock.location').search(cr, uid, [('usage', 'in', ('production', 'supplier', 'inventory'))], context=context)
 -        #domain.append(('location_id','not in',ignore_location_ids))
          res = []
          offset = 0
          while quantity > 0:
@@@ -666,18 -682,11 +676,11 @@@ class stock_picking(osv.osv)
  
      def _get_pickings(self, cr, uid, ids, context=None):
          res = set()
 -        for move in self.read(cr, uid, ids, ['picking_id'], context=context):
 -            if move['picking_id']:
 -                res.add(move['picking_id'][0])
 +        for move in self.browse(cr, uid, ids, context=context):
 +            if move.picking_id:
 +                res.add(move.picking_id.id)
          return list(res)
  
-     def _get_pickings_from_quant(self, cr, uid, ids, context=None):
-         res = set()
-         for quant in self.browse(cr, uid, ids, context=context):
-             if quant.reservation_id and quant.reservation_id.picking_id:
-                 res.add(quant.reservation_id.picking_id.id)
-         return list(res)
- 
      def _get_pack_operation_exist(self, cr, uid, ids, field_name, arg, context=None):
          res = {}
          for pick in self.browse(cr, uid, ids, context=context):

diff --cc addons/stock_account/wizard/stock_valuation_history.py
Simple merge