[MERGE] forward port of branch saas-4 up to f68c835
[odoo/odoo.git] / addons / purchase_requisition / purchase_requisition.py
index 592058b..678aadf 100644 (file)
@@ -23,99 +23,159 @@ from datetime import datetime
 from dateutil.relativedelta import relativedelta
 import time
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
-    _description="Purchase Requisition"
+    _description = "Purchase Requisition"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
+
+    def _get_po_line(self, cr, uid, ids, field_names, arg=None, context=None):
+        result = {}.fromkeys(ids, [])
+        for element in self.browse(cr, uid, ids, context=context):
+            for po in element.purchase_ids:
+                result[element.id] += [po_line.id for po_line in po.order_line]
+        return result
+
     _columns = {
-        'name': fields.char('Requisition Reference', size=32,required=True),
+        'name': fields.char('Call for Bids Reference', size=32, required=True),
         'origin': fields.char('Source Document', size=32),
-        'date_start': fields.datetime('Requisition Date'),
-        'date_end': fields.datetime('Requisition Deadline'),
+        'ordering_date': fields.date('Scheduled Ordering Date'),
+        'date_end': fields.datetime('Bid Submission Deadline'),
+        'schedule_date': fields.date('Scheduled Date', select=True, help="The expected and scheduled date where all the products are received"),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nMultiple Requisitions: It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
+        'exclusive': fields.selection([('exclusive', 'Select only one RFQ (exclusive)'), ('multiple', 'Select multiple RFQ')], 'Bid Selection Type', required=True, help="Select only one RFQ (exclusive):  On the confirmation of a purchase order, it cancels the remaining purchase order.\nSelect multiple RFQ:  It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
-        'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
-        'state': fields.selection([('draft','New'),('in_progress','Sent to Suppliers'),('cancel','Cancelled'),('done','Purchase Done')],
-            'Status', track_visibility='onchange', required=True)
+        'purchase_ids': fields.one2many('purchase.order', 'requisition_id', 'Purchase Orders', states={'done': [('readonly', True)]}),
+        'po_line_ids': fields.function(_get_po_line, method=True, type='one2many', relation='purchase.order.line', string='Products by supplier'),
+        'line_ids': fields.one2many('purchase.requisition.line', 'requisition_id', 'Products to Purchase', states={'done': [('readonly', True)]}),
+        'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null'),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
+        'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Confirmed'), ('open', 'Bid Selection'), ('done', 'PO Created'), ('cancel', 'Cancelled')],
+            'Status', track_visibility='onchange', required=True),
+        'multiple_rfq_per_supplier': fields.boolean('Multiple RFQ per supplier'),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', required=True),
     }
+
+    def _get_picking_in(self, cr, uid, context=None):
+        obj_data = self.pool.get('ir.model.data')
+        return obj_data.get_object_reference(cr, uid, 'stock','picking_type_in')[1]
+
     _defaults = {
-        'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
         'state': 'draft',
         'exclusive': 'multiple',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition', context=c),
-        'user_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
+        'user_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).id,
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
+        'picking_type_id': _get_picking_in,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
+        default = default or {}
         default.update({
-            'state':'draft',
-            'purchase_ids':[],
+            'state': 'draft',
+            'purchase_ids': [],
             'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
         })
         return super(purchase_requisition, self).copy(cr, uid, id, default, context)
-    
+
     def tender_cancel(self, cr, uid, ids, context=None):
         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])
+        #try to set all associated quotations to cancel state
+        purchase_ids = []
+        for tender in self.browse(cr, uid, ids, context=context):
+            for purchase_order in tender.purchase_ids:
+                purchase_order_obj.action_cancel(cr, uid, [purchase_order.id], context=context)
+                purchase_order_obj.message_post(cr, uid, [purchase_order.id], body=_('Cancelled by the tender associated to this quotation.'), context=context)
         procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', 'in', ids)], context=context)
         self.pool['procurement.order'].action_done(cr, uid, procurement_ids)
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def tender_in_progress(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
+        return self.write(cr, uid, ids, {'state': 'in_progress'}, context=context)
+
+    def tender_open(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def tender_reset(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state': 'draft'})
+        self.write(cr, uid, ids, {'state': 'draft'})
+        for p_id in ids:
+            # Deleting the existing instance of workflow for PO
+            self.delete_workflow(cr, uid, [p_id])
+            self.create_workflow(cr, uid, [p_id])
+        return True
 
     def tender_done(self, cr, uid, ids, context=None):
         procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', 'in', ids)], context=context)
         self.pool['procurement.order'].action_done(cr, uid, procurement_ids)
-        return self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
-
-    def _planned_date(self, requisition, delay=0.0):
-        company = requisition.company_id
-        date_planned = False
-        if requisition.date_start:
-            date_planned = datetime.strptime(requisition.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
-        else:
-            date_planned = datetime.today() - relativedelta(days=company.po_lead)
-        if delay:
-            date_planned -= relativedelta(days=delay)
-        return date_planned and date_planned.strftime('%Y-%m-%d %H:%M:%S') or False
-
-    def _seller_details(self, cr, uid, requisition_line, supplier, context=None):
+        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
+
+    def open_product_line(self, cr, uid, ids, context=None):
+        """ This opens product line view to view all lines from the different quotations, groupby default by product and partner to show comparaison
+            between supplier price
+            @return: the product line tree view
+        """
+        if context is None:
+            context = {}
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'purchase_requisition', 'purchase_line_tree', context=context)
+        res['context'] = context
+        po_lines = self.browse(cr, uid, ids, context=context)[0].po_line_ids
+        res['context'] = {
+            'search_default_groupby_product': True,
+            'search_default_hide_cancelled': True,
+        }
+        res['domain'] = [('id', 'in', [line.id for line in po_lines])]
+        return res
+
+    def open_rfq(self, cr, uid, ids, context=None):
+        """ This opens rfq view to view all quotations associated to the call for bids
+            @return: the RFQ tree view
+        """
+        if context is None:
+            context = {}
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'purchase', 'purchase_rfq', context=context)
+        res['context'] = context
+        po_ids = [po.id for po in self.browse(cr, uid, ids, context=context)[0].purchase_ids]
+        res['domain'] = [('id', 'in', po_ids)]
+        return res
+
+    def _prepare_purchase_order(self, cr, uid, requisition, supplier, context=None):
+        supplier_pricelist = supplier.property_product_pricelist_purchase and supplier.property_product_pricelist_purchase.id or False
+        picking_type_in = self.pool.get("purchase.order")._get_picking_in(cr, uid, context=context)
+        return {
+            'origin': requisition.name,
+            'date_order': requisition.date_end or fields.date.context_today(self, cr, uid, context=context),
+            'partner_id': supplier.id,
+            'pricelist_id': supplier_pricelist,
+            'location_id': requisition.picking_type_id.default_location_dest_id.id,
+            'company_id': requisition.company_id.id,
+            'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
+            'requisition_id': requisition.id,
+            'notes': requisition.description,
+            'picking_type_id': picking_type_in,
+        }
+
+    def _prepare_purchase_order_line(self, cr, uid, requisition, requisition_line, purchase_id, supplier, context=None):
+        po_line_obj = self.pool.get('purchase.order.line')
         product_uom = self.pool.get('product.uom')
-        pricelist = self.pool.get('product.pricelist')
         product = requisition_line.product_id
         default_uom_po_id = product.uom_po_id.id
+        date_order = requisition.ordering_date or fields.date.context_today(self, cr, uid, context=context)
         qty = product_uom._compute_qty(cr, uid, requisition_line.product_uom_id.id, requisition_line.product_qty, default_uom_po_id)
-        seller_delay = 0.0
-        seller_price = False
-        seller_qty = False
-        for product_supplier in product.seller_ids:
-            if supplier.id ==  product_supplier.name and qty >= product_supplier.qty:
-                seller_delay = product_supplier.delay
-                seller_qty = product_supplier.qty
-        supplier_pricelist = supplier.property_product_pricelist_purchase or False
-        seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, supplier.id, {'uom': default_uom_po_id})[supplier_pricelist.id]
-        if seller_qty:
-            qty = max(qty,seller_qty)
-        date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)
-        return seller_price, qty, default_uom_po_id, date_planned
+        supplier_pricelist = supplier.property_product_pricelist_purchase and supplier.property_product_pricelist_purchase.id or False
+        vals = po_line_obj.onchange_product_id(cr, uid, [], supplier_pricelist, product.id, qty, default_uom_po_id,
+            supplier.id, date_order=date_order, fiscal_position_id=supplier.property_account_position, date_planned=requisition_line.schedule_date,
+            name=False, price_unit=False, state='draft', context=context)['value']
+        vals.update({
+            'order_id': purchase_id,
+            'product_id': product.id,
+            'account_analytic_id': requisition_line.account_analytic_id.id,
+        })
+        return vals
 
     def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
         """
@@ -127,62 +187,137 @@ class purchase_requisition(osv.osv):
         purchase_order = self.pool.get('purchase.order')
         purchase_order_line = self.pool.get('purchase.order.line')
         res_partner = self.pool.get('res.partner')
-        fiscal_position = self.pool.get('account.fiscal.position')
         supplier = res_partner.browse(cr, uid, partner_id, context=context)
-        supplier_pricelist = supplier.property_product_pricelist_purchase or False
         res = {}
         for requisition in self.browse(cr, uid, ids, context=context):
-            if supplier.id in filter(lambda x: x, [rfq.state <> 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
-                 raise osv.except_osv(_('Warning!'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % rfq.state)
-            location_id = requisition.warehouse_id.lot_input_id.id
+            if not requisition.multiple_rfq_per_supplier and supplier.id in filter(lambda x: x, [rfq.state != 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
+                raise osv.except_osv(_('Warning!'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % rfq.state)
             context.update({'mail_create_nolog': True})
-            purchase_id = purchase_order.create(cr, uid, {
-                        'origin': requisition.name,
-                        'partner_id': supplier.id,
-                        'pricelist_id': supplier_pricelist.id,
-                        'location_id': location_id,
-                        'company_id': requisition.company_id.id,
-                        'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
-                        'requisition_id':requisition.id,
-                        'notes':requisition.description,
-                        'warehouse_id':requisition.warehouse_id.id ,
-            })
+            purchase_id = purchase_order.create(cr, uid, self._prepare_purchase_order(cr, uid, requisition, supplier, context=context), context=context)
             purchase_order.message_post(cr, uid, [purchase_id], body=_("RFQ created"), context=context)
             res[requisition.id] = purchase_id
             for line in requisition.line_ids:
-                product = line.product_id
-                seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
-                taxes_ids = product.supplier_taxes_id
-                taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
-                purchase_order_line.create(cr, uid, {
-                    'order_id': purchase_id,
-                    'name': product.partner_ref,
-                    'product_qty': qty,
-                    'product_id': product.id,
-                    'product_uom': default_uom_po_id,
-                    'price_unit': seller_price,
-                    'date_planned': date_planned,
-                    'taxes_id': [(6, 0, taxes)],
-                }, context=context)
-                
+                purchase_order_line.create(cr, uid, self._prepare_purchase_order_line(cr, uid, requisition, line, purchase_id, supplier, context=context), context=context)
         return res
 
+    def check_valid_quotation(self, cr, uid, quotation, context=None):
+        """
+        Check if a quotation has all his order lines bid in order to confirm it if its the case
+        return True if all order line have been selected during bidding process, else return False
 
-class purchase_requisition_line(osv.osv):
+        args : 'quotation' must be a browse record
+        """
+        for line in quotation.order_line:
+            if line.state != 'confirmed' or line.product_qty != line.quantity_bid:
+                return False
+        return True
+
+    def _prepare_po_from_tender(self, cr, uid, tender, context=None):
+        """ Prepare the values to write in the purchase order
+        created from a tender.
+
+        :param tender: the source tender from which we generate a purchase order
+        """
+        return {'order_line': [],
+                'requisition_id': tender.id,
+                'origin': tender.name}
+
+    def _prepare_po_line_from_tender(self, cr, uid, tender, line, purchase_id, context=None):
+        """ Prepare the values to write in the purchase order line
+        created from a line of the tender.
+
+        :param tender: the source tender from which we generate a purchase order
+        :param line: the source tender's line from which we generate a line
+        :param purchase_id: the id of the new purchase
+        """
+        return {'product_qty': line.quantity_bid,
+                'order_id': purchase_id}
+
+    def generate_po(self, cr, uid, ids, context=None):
+        """
+        Generate all purchase order based on selected lines, should only be called on one tender at a time
+        """
+        if context is None:
+            contex = {}
+        po = self.pool.get('purchase.order')
+        poline = self.pool.get('purchase.order.line')
+        id_per_supplier = {}
+        for tender in self.browse(cr, uid, ids, context=context):
+            if tender.state == 'done':
+                raise osv.except_osv(_('Warning!'), _('You have already generate the purchase order(s).'))
+
+            confirm = False
+            #check that we have at least confirm one line
+            for po_line in tender.po_line_ids:
+                if po_line.state == 'confirmed':
+                    confirm = True
+                    break
+            if not confirm:
+                raise osv.except_osv(_('Warning!'), _('You have no line selected for buying.'))
+
+            #check for complete RFQ
+            for quotation in tender.purchase_ids:
+                if (self.check_valid_quotation(cr, uid, quotation, context=context)):
+                    #use workflow to set PO state to confirm
+                    po.signal_purchase_confirm(cr, uid, [quotation.id])
+
+            #get other confirmed lines per supplier
+            for po_line in tender.po_line_ids:
+                #only take into account confirmed line that does not belong to already confirmed purchase order
+                if po_line.state == 'confirmed' and po_line.order_id.state in ['draft', 'sent', 'bid']:
+                    if id_per_supplier.get(po_line.partner_id.id):
+                        id_per_supplier[po_line.partner_id.id].append(po_line)
+                    else:
+                        id_per_supplier[po_line.partner_id.id] = [po_line]
+
+            #generate po based on supplier and cancel all previous RFQ
+            ctx = context.copy()
+            ctx['force_requisition_id'] = True
+            for supplier, product_line in id_per_supplier.items():
+                #copy a quotation for this supplier and change order_line then validate it
+                quotation_id = po.search(cr, uid, [('requisition_id', '=', tender.id), ('partner_id', '=', supplier)], limit=1)[0]
+                vals = self._prepare_po_from_tender(cr, uid, tender, context=context)
+                new_po = po.copy(cr, uid, quotation_id, default=vals, context=ctx)
+                #duplicate po_line and change product_qty if needed and associate them to newly created PO
+                for line in product_line:
+                    vals = self._prepare_po_line_from_tender(cr, uid, tender, line, new_po, context=context)
+                    poline.copy(cr, uid, line.id, default=vals, context=context)
+                #use workflow to set new PO state to confirm
+                po.signal_purchase_confirm(cr, uid, [new_po])
+
+            #cancel other orders
+            self.cancel_unconfirmed_quotations(cr, uid, tender, context=context)
+
+            #set tender to state done
+            self.signal_done(cr, uid, [tender.id])
+        return True
 
+    def cancel_unconfirmed_quotations(self, cr, uid, tender, context=None):
+        #cancel other orders
+        po = self.pool.get('purchase.order')
+        for quotation in tender.purchase_ids:
+            if quotation.state in ['draft', 'sent', 'bid']:
+                self.pool.get('purchase.order').signal_purchase_cancel(cr, uid, [quotation.id])
+                po.message_post(cr, uid, [quotation.id], body=_('Cancelled by the call for bids associated to this request for quotation.'), context=context)
+        return True
+
+
+class purchase_requisition_line(osv.osv):
     _name = "purchase.requisition.line"
-    _description="Purchase Requisition Line"
+    _description = "Purchase Requisition Line"
     _rec_name = 'product_id'
 
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product' ),
+        'product_id': fields.many2one('product.product', 'Product'),
         'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
-        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
-        'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
+        'requisition_id': fields.many2one('purchase.requisition', 'Call for Bids', ondelete='cascade'),
+        'company_id': fields.related('requisition_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account',),
+        'schedule_date': fields.date('Scheduled Date'),
     }
 
-    def onchange_product_id(self, cr, uid, ids, product_id, product_uom_id, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, product_uom_id, parent_analytic_account, analytic_account, parent_date, date, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
         @param product_id: Changed product_id
@@ -191,7 +326,11 @@ class purchase_requisition_line(osv.osv):
         value = {'product_uom_id': ''}
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            value = {'product_uom_id': prod.uom_id.id,'product_qty':1.0}
+            value = {'product_uom_id': prod.uom_id.id, 'product_qty': 1.0}
+        if not analytic_account:
+            value.update({'account_analytic_id': parent_analytic_account})
+        if not date:
+            value.update({'schedule_date': parent_date})
         return {'value': value}
 
     _defaults = {
@@ -200,19 +339,20 @@ class purchase_requisition_line(osv.osv):
 
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
+
     _columns = {
-        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
+        'requisition_id': fields.many2one('purchase.requisition', 'Call for Bids'),
     }
 
     def wkf_confirm_order(self, cr, uid, ids, context=None):
         res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context=context)
         proc_obj = self.pool.get('procurement.order')
         for po in self.browse(cr, uid, ids, context=context):
-            if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
+            if po.requisition_id and (po.requisition_id.exclusive == 'exclusive'):
                 for order in po.requisition_id.purchase_ids:
                     if order.id != po.id:
                         proc_ids = proc_obj.search(cr, uid, [('purchase_id', '=', order.id)])
-                        if proc_ids and po.state=='confirmed':
+                        if proc_ids and po.state == 'confirmed':
                             proc_obj.write(cr, uid, proc_ids, {'purchase_id': po.id})
                         self.signal_purchase_cancel(cr, uid, [order.id])
                     po.requisition_id.tender_done(context=context)
@@ -222,15 +362,49 @@ class purchase_order(osv.osv):
                     procurement.move_id.write({'location_id': procurement.move_id.location_dest_id.id})
         return res
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if context is None:
+            context = {}
+        if not context.get('force_requisition_id'):
+            default = default or {}
+            default.update({'requisition_id': False})
+        return super(purchase_order, self).copy(cr, uid, id, default=default, context=context)
+
+    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, group_id, context=None):
+        stock_move_lines = super(purchase_order, self)._prepare_order_line_move(cr, uid, order, order_line, picking_id, group_id, context=context)
+        if order.requisition_id and order.requisition_id.procurement_id and order.requisition_id.procurement_id.move_dest_id:
+            for i in range(0, len(stock_move_lines)):
+                stock_move_lines[i]['move_dest_id'] = order.requisition_id.procurement_id.move_dest_id.id
+        return stock_move_lines
 
-class product_product(osv.osv):
-    _inherit = 'product.product'
+
+class purchase_order_line(osv.osv):
+    _inherit = 'purchase.order.line'
 
     _columns = {
-        'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box to generates purchase requisition instead of generating requests for quotation from procurement.")
+        'quantity_bid': fields.float('Quantity Bid', digits_compute=dp.get_precision('Product Unit of Measure'), help="Technical field for not loosing the initial information about the quantity proposed in the bid"),
     }
-    _defaults = {
-        'purchase_requisition': False
+
+    def action_draft(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+
+    def action_confirm(self, cr, uid, ids, context=None):
+        super(purchase_order_line, self).action_confirm(cr, uid, ids, context=context)
+        for element in self.browse(cr, uid, ids, context=context):
+            if not element.quantity_bid:
+                self.write(cr, uid, ids, {'quantity_bid': element.product_qty}, context=context)
+        return True
+
+    def generate_po(self, cr, uid, tender_id, context=None):
+        #call generate_po from tender with active_id. Called from js widget
+        return self.pool.get('purchase.requisition').generate_po(cr, uid, [tender_id], context=context)
+
+
+class product_template(osv.osv):
+    _inherit = 'product.template'
+
+    _columns = {
+        'purchase_requisition': fields.boolean('Call for Bids', help="Check this box to generate Call for Bids instead of generating requests for quotation from procurement.")
     }
 
 
@@ -240,66 +414,35 @@ class procurement_order(osv.osv):
         'requisition_id': fields.many2one('purchase.requisition', 'Latest Requisition')
     }
 
-    def _get_warehouse(self, procurement, user_company):
-        """
-            Return the warehouse containing the procurment stock location (or one of it ancestors)
-            If none match, returns then first warehouse of the company
-        """
-        # NOTE This method is a copy of the one on the procurement.order defined in purchase
-        #      module. It's been copied to ensure it been always available, even if module
-        #      purchase is not up to date.
-        #      Do not forget to update both version in case of modification.
-        company_id = (procurement.company_id or user_company).id
-        domains = [
-            [
-                '&', ('company_id', '=', company_id),
-                '|', '&', ('lot_stock_id.parent_left', '<', procurement.location_id.parent_left),
-                          ('lot_stock_id.parent_right', '>', procurement.location_id.parent_right),
-                     ('lot_stock_id', '=', procurement.location_id.id)
-            ],
-            [('company_id', '=', company_id)]
-        ]
-
-        cr, uid = procurement._cr, procurement._uid
-        context = procurement._context
-        Warehouse = self.pool['stock.warehouse']
-        for domain in domains:
-            ids = Warehouse.search(cr, uid, domain, context=context)
-            if ids:
-                return ids[0]
-        return False
-
-    def make_po(self, cr, uid, ids, context=None):
-        res = {}
+    def _run(self, cr, uid, procurement, context=None):
         requisition_obj = self.pool.get('purchase.requisition')
-        non_requisition = []
-        for procurement in self.browse(cr, uid, ids, context=context):
-            if procurement.product_id.purchase_requisition:
-                user_company = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id
-                req = requisition_obj.create(cr, uid, {
-                    'origin': procurement.origin,
-                    'date_end': procurement.date_planned,
-                    'warehouse_id': self._get_warehouse(procurement, user_company),
-                    'company_id': procurement.company_id.id,
-                    'line_ids': [(0, 0, {
-                        'product_id': procurement.product_id.id,
-                        'product_uom_id': procurement.product_uom.id,
-                        'product_qty': procurement.product_qty
-
-                    })],
-                })
-                procurement.write({
-                    'state': 'running',
-                    'requisition_id': req
-                })
-                res[procurement.id] = 0
-            else:
-                non_requisition.append(procurement.id)
-
-        if non_requisition:
-            res.update(super(procurement_order, self).make_po(cr, uid, non_requisition, context=context))
+        warehouse_obj = self.pool.get('stock.warehouse')
+        if procurement.rule_id and procurement.rule_id.action == 'buy' and procurement.product_id.purchase_requisition:
+            warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id)], context=context)
+            requisition_id = requisition_obj.create(cr, uid, {
+                'origin': procurement.origin,
+                'date_end': procurement.date_planned,
+                'warehouse_id': warehouse_id and warehouse_id[0] or False,
+                'company_id': procurement.company_id.id,
+                'procurement_id': procurement.id,
+                'line_ids': [(0, 0, {
+                    'product_id': procurement.product_id.id,
+                    'product_uom_id': procurement.product_uom.id,
+                    'product_qty': procurement.product_qty
 
-        return res
+                })],
+            })
+            self.message_post(cr, uid, [procurement.id], body=_("Purchase Requisition created"), context=context)
+            return self.write(cr, uid, [procurement.id], {'requisition_id': requisition_id}, context=context)
+        return super(procurement_order, self)._run(cr, uid, procurement, context=context)
 
+    def _check(self, cr, uid, procurement, context=None):
+        requisition_obj = self.pool.get('purchase.requisition')
+        if procurement.rule_id and procurement.rule_id.action == 'buy' and procurement.product_id.purchase_requisition:
+            if procurement.requisition_id.state == 'done':
+                if any([purchase.shipped for purchase in procurement.requisition_id.purchase_ids]):
+                    return True
+            return False
+        return super(procurement_order, self)._check(cr, uid, procurement, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: