[MERGE] forward port of branch 7.0 up to 59b76ee

diff --cc addons/sale/sale.py
index b3fa9a0,1244cf0..e272aec
--- 1/addons/sale/sale.py
--- 2/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@@ -573,23 -579,10 +573,9 @@@ class sale_order(osv.osv)
  
      def action_button_confirm(self, cr, uid, ids, context=None):
          assert len(ids) == 1, 'This option should only be used for a single id at a time.'
 -        wf_service = netsvc.LocalService('workflow')
 -        wf_service.trg_validate(uid, 'sale.order', ids[0], 'order_confirm', cr)
 +        self.signal_order_confirm(cr, uid, ids)
- 
-         # redisplay the record as a sales order
-         view_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'view_order_form')
-         view_id = view_ref and view_ref[1] or False,
-         return {
-             'type': 'ir.actions.act_window',
-             'name': _('Sales Order'),
-             'res_model': 'sale.order',
-             'res_id': ids[0],
-             'view_type': 'form',
-             'view_mode': 'form',
-             'view_id': view_id,
-             'target': 'current',
-             'nodestroy': True,
-         }
- 
+         return True
+         
      def action_wait(self, cr, uid, ids, context=None):
          context = context or {}
          for o in self.browse(cr, uid, ids):