[MERGE]: merging from same branch

bzr revid: mga@mga-20100330073239-z9m226rrdsd2qaso

addons/mrp/mrp.py

@@ -139,8 +139,8 @@ class mrp_bom(osv.osv):
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
              @param ids: the ID of mrp.production object
-             @param name: 
-             @param arg: 
+             @param name: name of the field
+             @param arg: user defined argument
 
              @return:  True
         
@@ -157,9 +157,6 @@ class mrp_bom(osv.osv):
                 if sids:
                     bom2 = self.pool.get('mrp.bom').browse(cr, uid, sids[0], context=context)
                     result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
-        print "name",name
-        print "arg",arg   
-        print "result",result            
         return result
     def _compute_type(self, cr, uid, ids, field_name, arg, context):
         res = dict(map(lambda x: (x,''), ids))