[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition...

bzr revid: atp@tinyerp.com-20120601173011-te4xbjt67ba9y3dd

diff --cc addons/purchase_requisition/purchase_requisition.py
index 3e5d8b5,85a81c4..fa0a807
--- 1/addons/purchase_requisition/purchase_requisition.py
--- 2/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@@ -31,7 -31,7 +31,7 @@@ import decimal_precision as d
  class purchase_requisition(osv.osv):
      _name = "purchase.requisition"
      _description="Purchase Requisition"
-     _inherit = "mail.thread"
 -    _inherit = ['ir.needaction_mixin']
++    _inherit = ['ir.needaction_mixin', 'mail.thread']
      _columns = {
          'name': fields.char('Requisition Reference', size=32,required=True),
          'origin': fields.char('Source', size=32),