[MERGE] merged dev2 branch

bzr revid: qdp-launchpad@tinyerp.com-20110128112532-b2te782ia9ku7g94

addons/stock/stock_view.xml

@@ -1830,7 +1830,7 @@
             src_model="product.product"/>
 
         <act_window
-            domain="[('move_lines','in',[active_id])]"
+            domain="[('move_lines','=',active_id)]"
             id="act_relate_picking"
             name="Related Picking"
             res_model="stock.picking"

addons/stock/wizard/stock_change_product_qty.py

@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from tools.translate import _
+import tools
 
 class stock_change_product_qty(osv.osv_memory):
     _name = "stock.change.product.qty"
@@ -84,7 +85,7 @@ class stock_change_product_qty(osv.osv_memory):
 
         res_original = prod_obj_pool.browse(cr, uid, rec_id, context=context)
         for data in self.browse(cr, uid, ids, context=context):
-            inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: ') + str(res_original.name)}, context=context)
+            inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: ') + tools.ustr(res_original.name)}, context=context)
             line_data ={
                 'inventory_id' : inventory_id,
                 'product_qty' : data.new_quantity,