My Changes(warning.py,mrp.py) that are left to be included in Merge

bzr revid: ruchakpatel@gmail.com-20081105083551-q7b1zpvnothdszr1

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 28faa76..b5f16ab 100644 (file)
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -771,6 +771,18 @@ class mrp_procurement(osv.osv):
         'close_move': lambda *a: 0,
         'procure_method': lambda *a: 'make_to_order',
     }
+     
+    def unlink(self, cr, uid, ids):
+        procurements = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in procurements:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+        osv.osv.unlink(self, cr, uid, unlink_ids)
+        return True
+    
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
         if product_id:
             w=self.pool.get('product.product').browse(cr,uid,product_id, context)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 6eac261..adc68a4 100644 (file)
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -48,8 +48,10 @@ class sale_order(osv.osv):
         message=False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.sale_warn:
-            title= "Message",
-            message=partner.sale_warn_msg
+           warning={
+                'title': "Message",
+                'message': partner.sale_warn_msg
+                }
              
         result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)['value']
         if result.get('warning',False):
@@ -127,7 +129,7 @@ class product_product(osv.osv):
          'sale_line_warn_msg' : fields.text('Message for Sale Order Line'),
          'purchase_line_warn' : fields.boolean('Purchase Order Line'),
          'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
-    }
+     }
 product_product()
 
 class sale_order_line(osv.osv):