Merge lp:~camptocamp/openerp-humanitarian-ngo/add-bid_selected_state_on_po-nbi into lp:openerp-humanitarian-ngo/purchase-wkfl

[Nicolas Bessi - Camptocamp]

[ADD] a bid selected state on PO
[FIX] confirmation of cost estimate. PO in state bid will be cancel too

Add a bid selected state on PO
Fix confirmation of cost estimate. PO in state bid will be cancel too

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Add a bid selected state on PO
Fix confirmation of cost estimate. PO in state bid will be cancel too

[lp:~camptocamp/openerp-humanitarian-ngo/add-bid_selected_state_on_po-nbi]

74. By Nicolas Bessi <email address hidden> on 2014-01-08

[FIX] on change product line on po line to allows manual creation of purchase order

75. By Nicolas Bessi <email address hidden> on 2014-01-09

[FIX] test do not use draftbid state but sent state as we can not send context to the server

76. By Joël Grand-Guillaume @ camptocamp on 2014-01-28

[ADD] The pricelist on the requisition and bid creation process

77. By Joël Grand-Guillaume @ camptocamp on 2014-01-29

[IMP] Add a pricelist in tendering process

78. By Nicolas Bessi - Camptocamp on 2014-02-06

[MRG] from head

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM, Thanks !

review: Approve (code review + test)

[Romain Deheele - Camptocamp (romaindeheele)]

LGTM,

Romain

review: Approve (code review)

[lp:~camptocamp/openerp-humanitarian-ngo/add-bid_selected_state_on_po-nbi]

79. By Yannick Vaucher @ Camptocamp on 2014-02-06

[IMP] assign single dict value using key instead of using update

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review, no tests)

=== modified file 'purchase_extended/model/purchase_order.py'
--- purchase_extended/model/purchase_order.py	2013-11-13 08:49:37 +0000
+++ purchase_extended/model/purchase_order.py	2014-02-06 13:54:03 +0000
@@ -14,6 +14,7 @@
         ('sent', 'RFQ Sent'),
         ('draftbid', 'Draft Bid'),  # added
         ('bid', 'Bid Encoded'),  # Bid Received renamed into Bid Encoded
+        ('bid_selected', 'Bid selected'), # added
         ('draftpo', 'Draft PO'),  # added
         ('confirmed', 'Waiting Approval'),
         ('approved', 'Purchase Confirmed'),
@@ -236,17 +237,22 @@
         value['value']['dest_address_id'] = dest_id
         return value
 
+    def po_tender_requisition_selected(self, cr, uid, ids, context=None):
+        """Workflow function that write state 'bid selected'"""
+        return self.write(cr, uid, ids, {'state': 'bid_selected'},
+                          context=context)
+
 
 class purchase_order_line(orm.Model):
     _inherit = 'purchase.order.line'
 
     def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
             partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
-            name=False, price_unit=False, context=None, state='draft', type='rfq', **kwargs):
+            name=False, price_unit=False, context=None, state='draftpo', type='purchase', **kwargs):
         res = super(purchase_order_line, self).onchange_product_id(cr, uid, ids,
                 pricelist_id, product_id, qty, uom_id, partner_id, date_order,
                 fiscal_position_id, date_planned, name, price_unit, context)
-        if state == 'draft' and type == 'bid':
+        if state == 'draft' and type == 'rfq':
             res['value'].update({'price_unit': 0})
         elif state in ('sent', 'draftbid', 'bid'):
             if 'price_unit' in res['value']:
 
=== modified file 'purchase_extended/test/process/bid2order.yml'
--- purchase_extended/test/process/bid2order.yml	2013-11-01 11:44:19 +0000
+++ purchase_extended/test/process/bid2order.yml	2014-02-06 13:54:03 +0000
@@ -22,11 +22,16 @@
         date_planned: '2013-08-30'
         price_unit: 52.53
 -
-  Type must be 'bid' and the total untaxed amount of the RFQ must be computed.
+  I print the RFQ.
+-
+  !python {model: purchase.order}: |
+    self.print_quotation(cr, uid, [ref("purchase_order_ext_bid2order1")])
+-
+  Type must be 'rfq' and the total untaxed amount of the RFQ must be computed.
 -
   !assert {model: purchase.order, id: purchase_order_ext_bid2order1, string: The amount of RFQ is not correctly computed}:
-    - type == 'bid'
-    - state == 'draftbid'
+    - type == 'rfq'
+    - state == 'sent'
     - round(sum([l.price_subtotal for l in order_line]), 2) == round(amount_untaxed, 2)
 -
   I run the 'Bid encoded' wizard. I fill the date.
 
=== modified file 'purchase_extended/workflow/purchase_order.xml'
--- purchase_extended/workflow/purchase_order.xml	2013-08-07 12:39:30 +0000
+++ purchase_extended/workflow/purchase_order.xml	2014-02-06 13:54:03 +0000
@@ -55,6 +55,20 @@
             <field name="signal">purchase_cancel</field>
         </record>
 
+        <record id="act_po_requisition_selected" model="workflow.activity">
+          <field name="wkf_id" ref="purchase.purchase_order"/>
+          <field name="name">Bid selected</field>
+          <field name="kind">function</field>
+          <field name="action">po_tender_requisition_selected()</field>
+          <field name="flow_stop">True</field>
+        </record>
+        <record id="trans_po_requisition_selected" model="workflow.transition">
+          <field name="act_from" ref="purchase.act_bid"/>
+          <field name="act_to" ref="act_po_requisition_selected"/>
+          <field name="signal">select_requisition</field>
+        </record>
+
+
         <!-- Rename some activities to make the workflow clear -->
         <record id="purchase.act_draft" model="workflow.activity">
             <field name="name">draft RFQ</field>
 
=== modified file 'purchase_requisition_extended/model/purchase_order.py'
--- purchase_requisition_extended/model/purchase_order.py	2014-02-06 09:49:41 +0000
+++ purchase_requisition_extended/model/purchase_order.py	2014-02-06 13:54:03 +0000
@@ -62,6 +62,8 @@
             'incoterm_address': requisition.req_incoterm_address,
             'transport_mode_id': requisition.req_transport_mode_id,
         })
+        if requisition.pricelist_id:
+            values.update({'pricelist_id': requisition.pricelist_id.id})
         return values
 
     def copy(self, cr, uid, id, default=None, context=None):
 
=== 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	2014-02-06 13:54:03 +0000
@@ -25,15 +25,33 @@
                                          domain=[('type', 'in', ('rfq', 'bid'))]),
         # new
         'req_validity': fields.date("Requested Bid's End of Validity",
-                                    help="Default value requested to "
-                                         "the supplier."),
+                                    help="Requested validity period requested to the bidder, "
+                                         "i.e. please send bids that stay valid until that "
+                                         "date.\n The bidder is allowed to send a bid with "
+                                         "another validity end date that gets encoded in the "
+                                         "bid."),
         'bid_tendering_mode': fields.selection([('open', 'Open'),
                                                 ('restricted', 'Restricted')],
                                                'Call for Bids Mode'),
+                                               help="- Restricted : you select yourself the "
+                                                    "bidders and generate a RFQ for each of "
+                                                    "those. \n"
+                                                    "- Open : anybody can bid (you have to "
+                                                    "advertise the call for bids) and you "
+                                                    "directly encode the bids you received. "
+                                                    "You are still able to generate RFQ if "
+                                                    "you want to contact usual bidders."),
         'bid_receipt_mode': fields.selection([('open', 'Open'),
                                               ('sealed', 'Sealed')],
                                              'Bid Receipt Mode',
                                              required=True),
+                                             help="- Open : The bids can be opened when "
+                                                  "received and encoded. \n"
+                                                  "- Closed : The bids can be marked as "
+                                                  "received but they have to be opened \n"
+                                                  "all at the same time after an opening "
+                                                  "ceremony (probably specific to public "
+                                                  "sector)."),
         'consignee_id': fields.many2one('res.partner',
                                         'Consignee',
                                         help="Person responsible of delivery"),
@@ -55,6 +73,13 @@
             'account.payment.term',
             'Requested Payment Term',
             help="Default value requested to the supplier."),
+        'pricelist_id': fields.many2one('product.pricelist', 
+            'Pricelist',
+            help="If set that pricelist will be used to generate the RFQ."
+            "Mostely used to ask a requisition in a given currency."),
+        'date_end': fields.datetime('Bid Submission Deadline', 
+                                    help="All bids received after that date won't be valid "
+                                         " (probably specific to public sector)."),
     }
     _defaults = {
         'bid_receipt_mode': 'open',
@@ -83,6 +108,8 @@
             'incoterm_id': requisition.req_incoterm_id.id,
             'incoterm_address': requisition.req_incoterm_address,
         })
+        if requisition.pricelist_id:
+            values['pricelist_id'] = requisition.pricelist_id.id
         return values
 
     def _prepare_purchase_order_line(self, cr, uid, requisition,
@@ -142,18 +169,34 @@
                              context=context)
         return super(PurchaseRequisition, self).generate_po(cr, uid, [ids], context=context)
 
+    def quotation_selected(self, cr, uid, quotation, context=None):
+        """Predicate that checks if a quotation has at least one line chosen
+        :param quotation: record of 'purchase.order'
+
+        :returns: True if one line has been chosen
+
+        """
+        # This topic is subject to changes
+        return quotation.bid_partial
+
     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']:
-                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.'),
-                        context=context)
+            if quotation.state in ['draft', 'sent', 'bid']:
+                if self.quotation_selected(cr, uid, quotation, context=context):
+                    wf_service.trg_validate(uid, 'purchase.order', quotation.id,
+                                            'select_requisition', cr)
+                else:
+                    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.'),
+                                    context=context)
 
         return True
 
@@ -226,19 +269,6 @@
         res['domain'] = expression.AND([eval(res.get('domain', [])), [('requisition_id', 'in', ids)]])
         return res
 
-    def open_product_line(self, cr, uid, ids, context=None):
-        """ Filter to show only lines from bids received. Group by requisition line instead of product for unicity
-        """
-        res = super(PurchaseRequisition, self).open_product_line(cr, uid, ids, context=context)
-        ctx = res.setdefault('context', {})
-        if 'search_default_groupby_product' in ctx:
-            del ctx['search_default_groupby_product']
-        if 'search_default_hide_cancelled' in ctx:
-            del ctx['search_default_hide_cancelled']
-        ctx['search_default_groupby_requisitionline'] = True
-        ctx['search_default_showbids'] = True
-        return res
-
     def close_callforbids(self, cr, uid, ids, context=None):
         """
         Check all quantities have been sourced
@@ -289,6 +319,19 @@
             'context': ctx,
         }
 
+    def open_product_line(self, cr, uid, ids, context=None):
+        """ Filter to show only lines from bids received. Group by requisition line instead of product for unicity
+        """
+        res = super(PurchaseRequisition, self).open_product_line(cr, uid, ids, context=context)
+        ctx = res.setdefault('context', {})
+        if 'search_default_groupby_product' in ctx:
+            del ctx['search_default_groupby_product']
+        if 'search_default_hide_cancelled' in ctx:
+            del ctx['search_default_hide_cancelled']
+        ctx['search_default_groupby_requisitionline'] = True
+        ctx['search_default_showbids'] = True
+        return res
+
     def close_callforbids_ok(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
 
=== modified file 'purchase_requisition_extended/view/purchase_requisition.xml'
--- purchase_requisition_extended/view/purchase_requisition.xml	2013-08-08 09:31:25 +0000
+++ purchase_requisition_extended/view/purchase_requisition.xml	2014-02-06 13:54:03 +0000
@@ -21,6 +21,7 @@
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
                     <field name="bid_tendering_mode" attrs="{'readonly': [('state','not in',('draft'))]}" required="1"/>
+                    <field name="pricelist_id" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                 </xpath>
                 <separator string="Requests for Quotation" position="attributes">
                     <attribute name="string">Requests for Quotation / Bids</attribute>