Merge lp:~openerp-dev/openobject-addons/trunk-bug-1188479-dharmraj into lp:openobject-addons

[Dharmraj Zala(OpenERP)]

Hello,

I have fixed both the issues . When Purchase order line is in confirmed state, the exception is raised on its deletion. And when we cancel the po and set it to the draft, its order lines' states also change accordingly.

Thanks,
Dharmraj.

Unmerged revisions

8755. By Dharmraj Zala(OpenERP) on 2013-06-07

[FIX] improved the behavior by raising exception on polines deletion and setting state of polines

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2013-05-21 12:23:59 +0000
+++ purchase/purchase.py	2013-06-07 07:07:28 +0000
@@ -489,6 +489,12 @@
     def action_cancel_draft(self, cr, uid, ids, context=None):
         if not len(ids):
             return False
+        todo = []
+        for orders in self.browse(cr, uid, ids, context=context):
+            if orders.order_line:
+                for lines in orders.order_line:
+                    todo.append(lines.id)
+        self.pool.get('purchase.order.line').action_draft(cr, uid, todo, context)            
         self.write(cr, uid, ids, {'state':'draft','shipped':0})
         for p_id in ids:
             # Deleting the existing instance of workflow for PO
@@ -574,7 +580,11 @@
         return False
 
     def action_cancel(self, cr, uid, ids, context=None):
+        todo = [] 
         for purchase in self.browse(cr, uid, ids, context=context):
+            if purchase.order_line:
+                for lines in purchase.order_line:
+                    todo.append(lines.id)
             for pick in purchase.picking_ids:
                 if pick.state not in ('draft','cancel'):
                     raise osv.except_osv(
@@ -590,6 +600,7 @@
             self.pool.get('account.invoice') \
                 .signal_invoice_cancel(cr, uid, map(attrgetter('id'), purchase.invoice_ids))
         self.write(cr,uid,ids,{'state':'cancel'})
+        self.pool.get('purchase.order.line').action_cancel(cr, uid, todo, context) 
 
         self.signal_purchase_cancel(cr, uid, ids)
         return True
@@ -879,6 +890,12 @@
     _table = 'purchase_order_line'
     _name = 'purchase.order.line'
     _description = 'Purchase Order Line'
+    
+    def unlink(self, cr, uid, ids, context=None):
+        for id in ids:
+            if self.browse(cr,uid,id,context=context).state == 'confirmed':
+                raise osv.except_osv(_('Error!'), _('You can not delete Purchase Order Lines which are confirmed!!'))
+        return super(purchase_order_line, self).unlink(cr, uid, ids, context=context)
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -1015,7 +1032,14 @@
     def action_confirm(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
         return True
-
+        
+    def action_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        return True
+        
+    def action_cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
+        return True
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'