[MERGE] merge with parent branch

bzr revid: rma@tinyerp.com-20121001085821-7c7g51mtgdp99qgl

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/procurement/procurement.py
index 1c2decb,c9b0976..a4bb850
--- 1/addons/procurement/procurement.py
--- 2/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@@ -110,11 -97,12 +110,11 @@@ class procurement_order(osv.osv)
          'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
          'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
          'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
-         'close_move': fields.boolean('Close Move at end', required=True),
+         'close_move': fields.boolean('Close Move at end'),
          'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-         'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
              readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
              " a make to order method."),
 -
          'note': fields.text('Note'),
          'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."),
          'state': fields.selection([

diff --cc addons/procurement/procurement_view.xml
Simple merge

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/purchase_requisition/purchase_requisition_view.xml
Simple merge