[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120619113458-kv47p9410o4nnuoz

addons/mrp_repair/mrp_repair.py

@@ -122,7 +122,7 @@ class mrp_repair(osv.osv):
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
-            ('cancel','Cancel'),
+            ('cancel','Cancelled'),
             ('confirmed','Confirmed'),
             ('under_repair','Under Repair'),
             ('ready','Ready to Repair'),

addons/mrp_repair/mrp_repair_view.xml

@@ -45,7 +45,7 @@
                <sheet string="Repairs order">
                     <label for="product_id" class="oe_form_readonly_hidden"/>
                     <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)" domain="[('type','!=','service')]"/>
                     </h1>
                     <label for="name" class="oe_form_readonly_hidden"/>
                     <h2>
@@ -56,7 +56,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)"/>
                             <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}"/>
                             <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
-                            <field name="move_id" on_change="onchange_move_id(product_id, move_id)"/>
+                            <field name="move_id" on_change="onchange_move_id(product_id, move_id)" context="{'default_product_id':product_id}"/>
                         </group>
                         <group>
                             <field name="deliver_bool"/>