=== modified file 'warning/warning.py'
--- warning/warning.py	2009-04-09 10:02:19 +0000
+++ warning/warning.py	2009-10-20 11:39:53 +0000
@@ -65,19 +65,20 @@
         if partner.sale_warn != 'no-message':
             if partner.sale_warn == 'block':
                 raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.sale_warn_msg)
-            
+            title =  "Warning for " + partner.name
+            message = partner.sale_warn_msg
             warning = {
-                    'title': "Warning for " + partner.name,
-                    'message': partner.sale_warn_msg
+                    'title': title,
+                    'message': message,
             }
 
-        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)['value']
+        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
         
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
             
-        return {'value': result, 'warning':warning}
+        return {'value': result['value'], 'warning':warning}
 sale_order()
 
 
@@ -87,17 +88,25 @@
         if not part:
             return {'value':{'partner_address_id': False}}
         warning = {}
+        title = False
+        message = False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.purchase_warn != 'no-message':
             if partner.purchase_warn == 'block':
                 raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.purchase_warn_msg)
-            
+            title = "Warning for " + partner.name
+            message = partner.purchase_warn_msg
             warning = {
-                'title': "Warning for " + partner.name,
-                'message': partner.purchase_warn_msg
+                'title': title,
+                'message': message
                 }
-        result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)['value']
-        return {'value': result, 'warning':warning}
+        result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)
+        
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+            
+        return {'value': result['value'], 'warning':warning}
     
 purchase_order()
 
@@ -116,17 +125,27 @@
             }
         }
         warning = {}
+        title = False
+        message = False
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
         if partner.invoice_warn != 'no-message':
             if partner.invoice_warn == 'block':
                 raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.invoice_warn_msg)
+            
+            title = "Warning for " + partner.name
+            message = partner.invoice_warn_msg
             warning = {
-                'title': "Warning for " + partner.name,
-                'message': partner.invoice_warn_msg
+                'title': title,
+                'message': message
                 }
         result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False)['value']
-        return {'value': result, 'warning':warning}
+            date_invoice=False, payment_term=False, partner_bank_id=False)
+        
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+        
+        return {'value': result['value'], 'warning':warning}
     
 account_invoice()
 
@@ -138,15 +157,23 @@
             return {}
         partner = self.pool.get('res.partner.address').browse(cr, uid, [partner_id])[0].partner_id
         warning = {}
+        title = False
+        message = False
         if partner.picking_warn != 'no-message':
             if partner.picking_warn == 'block':
                 raise osv.except_osv(_('Alert for ' + partner.name +' !'), partner.picking_warn_msg)
+            title = "Warning for " + partner.name
+            message = partner.picking_warn_msg
             warning = {
-                'title': "Warning for " + partner.name,
-                'message': partner.picking_warn_msg
+                'title': title,
+                'message': message
             }
         result =  super(stock_picking, self).onchange_partner_in(cr, uid, context, partner_id)
-        return {'value': result, 'warning':warning}
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+        
+        return {'value': result['value'], 'warning':warning}
     
 stock_picking()
 
@@ -193,12 +220,12 @@
         result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
             lang, update_tax, date_order, packaging, fiscal_position, flag)
-        if title and message:
-             warning['title']=title[0]
-             warning['message']=message
+#        if title and message:
+#             warning['title'] = title
+#             warning['message']= message
 
         if result.get('warning',False):
-            warning['title'] = title and title[0]+' & '+result['warning']['title'] or result['warning']['title']
+            warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
         return {'value': result['value'], 'warning':warning}
@@ -229,7 +256,7 @@
             partner_id, date_order, fiscal_position)
 
         if result.get('warning',False):
-            warning['title'] = title and title[0]+' & '+result['warning']['title'] or result['warning']['title']
+            warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
         return {'value': result['value'], 'warning':warning}