[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20121012055152-qyi3ev9bt0qwua44

diff --cc addons/mail/tests/test_mail.py
Simple merge

diff --cc addons/purchase/purchase.py
index b4091a9,db6ed8b..228927c
--- 1/addons/purchase/purchase.py
--- 2/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@@ -1084,15 -1084,14 +1084,20 @@@ class procurement_order(osv.osv)
              }
              res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=new_context)
              self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
-             self.running_send_note(cr, uid, [procurement.id], context=context)
+         self.purchase_order_create_note(cr, uid, ids, context=context)
          return res
 +    
 +    def _product_virtual_get(self, cr, uid, order_point):
 +        procurement = order_point.procurement_id
 +        if procurement and procurement.state != 'exception' and procurement.purchase_id and procurement.purchase_id.state in ('draft', 'confirmed'):
 +            return None
 +        return super(procurement_order, self)._product_virtual_get(cr, uid, order_point)
  
+     def purchase_order_create_note(self, cr, uid, ids, context=None):
+         for procurement in self.browse(cr, uid, ids, context=context):
+             body = _("Draft Purchase Order created")
+             self.message_post(cr, uid, [procurement.id], body=body, context=context)
+ 
  procurement_order()
  
  class mail_mail(osv.osv):

diff --cc addons/sale_stock/res_config_view.xml
Simple merge

diff --cc addons/stock/stock.py
Simple merge