[MERGE] merged the branch that adds the location_id and location_dest_id on the pack...

bzr revid: qdp-launchpad@openerp.com-20140312143030-jb23rhsi81ykejwt

diff --cc addons/stock/stock.py
index 1e83b9d,3db4d00..00f084f
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -257,7 -257,7 +257,7 @@@ class stock_quant(osv.osv)
          'propagated_from_id': fields.many2one('stock.quant', 'Linked Quant', help='The negative quant this is coming from'),
          'negative_move_id': fields.many2one('stock.move', 'Move Negative Quant', help='If this is a negative quant, this will be the move that caused this negative quant.'),
          'negative_dest_location_id': fields.related('negative_move_id', 'location_dest_id', type='many2one', relation='stock.location', string="Negative Destination Location",
--                                                    help="Technical field used to record the destination location of a move that created a negative quant"), 
++                                                    help="Technical field used to record the destination location of a move that created a negative quant"),
          'inventory_value': fields.function(_calc_inventory_value, string="Inventory Value", type='float', readonly=True),
      }
  
@@@ -942,8 -1040,9 +1046,7 @@@ class stock_picking(osv.osv)
      def do_prepare_partial(self, cr, uid, picking_ids, context=None):
          context = context or {}
          pack_operation_obj = self.pool.get('stock.pack.operation')
-         pack_obj = self.pool.get("stock.quant.package")
-         quant_obj = self.pool.get("stock.quant")
 -        #pack_obj = self.pool.get("stock.quant.package")
 -        #quant_obj = self.pool.get("stock.quant")
+ 
          #get list of existing operations and delete them
          existing_package_ids = pack_operation_obj.search(cr, uid, [('picking_id', 'in', picking_ids)], context=context)
          if existing_package_ids: