openerp-community-reviewer team mailing list archive

[Nicolas Bessi - Camptocamp <nicolas.bessi@xxxxxxxxxxxxxx>]

Nicolas Bessi - Camptocamp has proposed merging lp:~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_confirm-nbi into lp:openerp-humanitarian-ngo/purchase-wkfl.

Requested reviews:
  OpenERP for Humanitarian Core Editors (humanitarian-core-editors)

For more details, see:
https://code.launchpad.net/~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_confirm-nbi/+merge/197918

Fix confirmation of cost estimate. PO in state bid will be cancel too
-- 
https://code.launchpad.net/~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_confirm-nbi/+merge/197918
Your team OpenERP for Humanitarian Core Editors is requested to review the proposed merge of lp:~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_confirm-nbi into lp:openerp-humanitarian-ngo/purchase-wkfl.

=== modified file 'purchase_requisition_extended/model/purchase_requisition.py'
--- purchase_requisition_extended/model/purchase_requisition.py	2013-11-01 11:44:19 +0000
+++ purchase_requisition_extended/model/purchase_requisition.py	2013-12-05 16:20:39 +0000
@@ -142,14 +142,17 @@
                              context=context)
         return super(PurchaseRequisition, self).generate_po(cr, uid, [ids], context=context)
 
+
+
     def cancel_quotation(self, cr, uid, tender, context=None):
         """
         Called from generate_po. Cancel only draft and sent rfq
         """
         po = self.pool.get('purchase.order')
         wf_service = netsvc.LocalService("workflow")
+        tender.refresh()
         for quotation in tender.purchase_ids:
-            if quotation.state in ['draft', 'sent']:
+            if quotation.state in ['draft', 'sent', 'bid']:
                 wf_service.trg_validate(uid, 'purchase.order', quotation.id, 'purchase_cancel', cr)
                 po.message_post(cr, uid, [quotation.id],
                         body=_('Canceled by the call for bids associated to this request for quotation.'),