[MERGE]

bzr revid: hmo@tinyerp.com-20121003105212-651698je5ye1zpuz

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

diff --cc addons/mrp/procurement.py
index 40da3ab,795ac54..f718856
--- 1/addons/mrp/procurement.py
--- 2/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@@ -31,10 -31,9 +31,10 @@@ class procurement_order(osv.osv)
      _columns = {
          'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
          'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
 +        'production_id': fields.many2one('mrp.production', 'Manufucture Order'),
      }
      
-     def check_produce_product(self, cr, uid, procurement, context=[]):
+     def check_produce_product(self, cr, uid, procurement, context=None):
          """ Finds the bill of material for the product from procurement order.
          @return: True or False
          """

diff --cc addons/procurement/procurement.py
index ab644dd,5d81bcb..aa3b2a2
--- 1/addons/procurement/procurement.py
--- 2/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@@ -495,16 -498,22 +495,16 @@@ class procurement_order(osv.osv)
          return obj_id
  
      def create_send_note(self, cr, uid, ids, context=None):
-         self.message_post(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
+         self.message_post(cr, uid, ids, body=_("Procurement <b>created</b>."), context=context)
  
      def confirm_send_note(self, cr, uid, ids, context=None):
-         self.message_post(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
+         self.message_post(cr, uid, ids, body=_("Procurement <b>confirmed</b>."), context=context)
  
 -    def running_send_note(self, cr, uid, ids, context=None):
 -        self.message_post(cr, uid, ids, body=_("Procurement set to <b>running</b>."), context=context)
 -
 -    def ready_send_note(self, cr, uid, ids, context=None):
 -        self.message_post(cr, uid, ids, body=_("Procurement set to <b>ready</b>."), context=context)
 -
      def cancel_send_note(self, cr, uid, ids, context=None):
-         self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
+         self.message_post(cr, uid, ids, body=_("Procurement <b>cancelled</b>."), context=context)
  
      def done_send_note(self, cr, uid, ids, context=None):
-         self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
+         self.message_post(cr, uid, ids, body=_("Procurement <b>done</b>."), context=context)
  
  procurement_order()
  

diff --cc addons/project_mrp/project_procurement.py
Simple merge

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