Merge lp:~camptocamp/openobject-addons/7.0-fix_1220716-rha+srt+afe into lp:openobject-addons/7.0

[Alexandre Fayolle - camptocamp]

I rebased the changes of Rifakat <email address hidden> on top of the 7.0 branch, fixing the conflicts in the way Stefan Rijnhart (Therp) (stefan-therp) suggested in the other MP, and added fixes I made for OCB in order to repair the tests so that runbot should be green for this branch.

[Rifakat Husen (OpenERP) (rha-openerp)]

Hi,

_requisition_procurement_cancel() would become private method, could we change the name? What do you say?

Regards.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Hi Rifakat,

I think that introducing a new public method in stable is not accepted, so in order to give this patch a chance of getting merged I'm -1 on changing the name.

[Rifakat Husen (OpenERP) (rha-openerp)]

Yes right. Thanks Alexandre.

Unmerged revisions

9878. By Alexandre Fayolle - camptocamp on 2014-03-07

[FIX] purchase_requisition: fix broken test

cancel_purchase_requisition.yml:
  * use a different requisition from the one processed int purchase_requision.yml
  * fix the 'I delete requisition' step which used to destroy a purchase.order

purchase_requisition.yml:
  * add a check taht the purchase.requisition cannot be cancelled if the purchase.order are not cancelled first.

9877. By Rifakat Husen (OpenERP) on 2013-06-12

[IMP] refactorize code by adding new function to be reused from unlink() and tender_cancel()

9876. By Rifakat Husen (OpenERP) on 2013-06-12

[FIX] purchase_requisition: restricitng deletion of PR and also imp for cancelling PR

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2013-11-26 18:07:26 +0000
+++ purchase_requisition/purchase_requisition.py	2014-03-07 14:48:16 +0000
@@ -65,14 +65,45 @@
             'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
         })
         return super(purchase_requisition, self).copy(cr, uid, id, default, context)
-    
+
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Deletes Requisition and related RFQs 
+        """
+        if context is None: context = {}
+        purchase_obj = self.pool.get('purchase.order')
+        purchase_ids = self._requisition_procurement_cancel(cr, uid, ids, context=context)
+        if purchase_ids:
+            purchase_obj.unlink(cr, uid, purchase_ids, context=context)
+        return super(purchase_requisition, self).unlink(cr, uid, ids, context=context)
+
+    def _requisition_procurement_cancel(self, cr, uid, ids, context=None):
+        """
+        Cancels procurement order related to requisition
+        @param ids: requisition ids
+        @return: Returns purchase orders associated with requisition if any
+        """
+        if context is None: context = {}
+        purchase_ids = []
+        procurement_ids = []
+        procurement_obj = self.pool.get('procurement.order')
+        for requisition in self.browse(cr, uid, ids, context=context):
+            purchase_ids.extend(purchase.id for purchase in requisition.purchase_ids)
+            if requisition.state == 'cancel':
+                continue
+            procurement_ids.extend(procurement_obj.search(cr, uid,
+                [('requisition_id', '=', requisition.id)], context=context))
+        if procurement_ids:
+            procurement_obj.action_cancel(cr, uid, procurement_ids)
+        return purchase_ids
+
     def tender_cancel(self, cr, uid, ids, context=None):
+        if context is None: context = {}
         purchase_order_obj = self.pool.get('purchase.order')
-        for purchase in self.browse(cr, uid, ids, context=context):
-            for purchase_id in purchase.purchase_ids:
-                if str(purchase_id.state) in('draft'):
-                    purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
-        return self.write(cr, uid, ids, {'state': 'cancel'})
+        purchase_ids = self._requisition_procurement_cancel(cr, uid, ids, context=context)
+        if purchase_ids:
+            purchase_order_obj.action_cancel(cr, uid, purchase_ids, context=context)
+        return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def tender_in_progress(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)

=== modified file 'purchase_requisition/test/cancel_purchase_requisition.yml'
--- purchase_requisition/test/cancel_purchase_requisition.yml	2011-12-02 05:15:06 +0000
+++ purchase_requisition/test/cancel_purchase_requisition.yml	2014-03-07 14:48:16 +0000
@@ -2,25 +2,25 @@
   I cancel requisition.
 -
   !python {model: purchase.requisition}: |
-    self.tender_cancel(cr, uid, [ref("requisition1")])
+    self.tender_cancel(cr, uid, [ref("requisition2")])
 -
   I check requisition after cancelled.
 -
-  !assert {model: purchase.requisition, id: requisition1}:
+  !assert {model: purchase.requisition, id: requisition2}:
     - state == 'cancel'
 -
   I reset requisition as "New".
 -
   !python {model: purchase.requisition}: |
-    self.tender_reset(cr, uid, [ref('requisition1')])
+    self.tender_reset(cr, uid, [ref('requisition2')])
 -
   I duplicate requisition.
 -
   !python {model: purchase.requisition}: |
-    self.copy(cr, uid, ref('requisition1'))
+    self.copy(cr, uid, ref('requisition2'))
 -
   I delete requisition.
 -
-  !python {model: purchase.order}: |
-    self.unlink(cr, uid, [ref("requisition1")])
+  !python {model: purchase.requisition}: |
+    self.unlink(cr, uid, [ref("requisition2")])
 

=== modified file 'purchase_requisition/test/purchase_requisition.yml'
--- purchase_requisition/test/purchase_requisition.yml	2012-11-29 22:26:45 +0000
+++ purchase_requisition/test/purchase_requisition.yml	2014-03-07 14:48:16 +0000
@@ -88,3 +88,14 @@
     (data, format) = netsvc.LocalService('report.purchase.requisition').create(cr, uid, [ref('purchase_requisition.requisition1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'purchase_requisition-purchase_requisition_report.'+format), 'wb+').write(data)
+-
+  I check that I cannot cancel the requisision
+-
+  !python {model: purchase.requisition}: |
+    from openerp.osv.osv import except_osv
+    try:
+        self.tender_cancel(cr, uid, [ref("requisition1")])
+    except except_osv, exc:
+        assert exc.args == (u'Unable to cancel this purchase order.', u'First cancel all receptions related to this purchase order.')
+    else:
+        assert False, 'tender_cancel should have failed'

=== modified file 'purchase_requisition/test/purchase_requisition_demo.yml'
--- purchase_requisition/test/purchase_requisition_demo.yml	2013-01-03 23:10:05 +0000
+++ purchase_requisition/test/purchase_requisition_demo.yml	2014-03-07 14:48:16 +0000
@@ -7,4 +7,10 @@
       - product_id: product.product_product_9
         product_qty: 10.0
         product_uom_id: product.product_uom_unit
-  
+-
+  !record {model: purchase.requisition, id: requisition2}:
+    exclusive: exclusive
+    line_ids:
+      - product_id: product.product_product_13
+        product_qty: 10.0
+        product_uom_id: product.product_uom_unit