merge

bzr revid: fp@tinyerp.com-20081127144942-oowly30zluri9pjc

addons/mrp/mrp.py

@@ -769,6 +769,7 @@ class mrp_procurement(osv.osv):
             " a make to order method."),
 
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+        'note': fields.text('Note'),
 
         'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
 

addons/project_mrp/__terp__.py

@@ -25,7 +25,7 @@
     "author" : "Tiny",
     "website" : "http://tinyerp.com/module_project.html",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["project", 'mrp', "sale"],
+    "depends" : ["project", 'mrp', "sale", "mrp_jit"],
     "description": """
 This module is used to automatically create tasks base on different
 procurements: sales order, manufacturing order, ...

addons/project_mrp/mrp.py

@@ -32,9 +32,12 @@ class mrp_procurement(osv.osv):
             sale_ids = sline.search(cr, uid, [('procurement_id','=',procurement.id)], context)
             content = ''
             l = None
+            project_id = None
             for line in sline.browse(cr, uid, sale_ids, context=context):
                 content += (line.notes or '')
                 l = line
+                if line.order_id.project_id:
+                    content+="\n\n"+line.order_id.project_id.complete_name
 
             self.write(cr, uid, [procurement.id], {'state':'running'})
             task_id = self.pool.get('project.task').create(cr, uid, {
@@ -43,7 +46,7 @@ class mrp_procurement(osv.osv):
                 'planned_hours': procurement.product_qty,
                 'remaining_hours': procurement.product_qty,
                 'user_id': procurement.product_id.product_manager.id,
-                'notes': l and l.order_id.note or '',
+                'notes': "b"+(l and l.order_id.note or ''),
                 'procurement_id': procurement.id,
                 'description': content,
                 'date_deadline': procurement.date_planned,

addons/sale/sale.py

@@ -262,6 +262,7 @@ class sale_order(osv.osv):
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
         return osv.osv.unlink(self, cr, uid, unlink_ids)        
+            
     
     def onchange_shop_id(self, cr, uid, ids, shop_id):
         v={}