Merge pull request OCA#111 from yvaucher/8.0-cba-repart

[ENH] purchase_requisition_bid_selection - add comparative bid analysis report

Author: jgrandguillaume

purchase_requisition_auto_rfq_bid_selection/test/purchase_requisition.yml

@@ -15,6 +15,7 @@
  !record {model: purchase.requisition, id: requisition1}:
    name: PR01
    bid_tendering_mode: open
+   pricelist_id: purchase.list0
    line_ids:
     - product_id: purchase_requisition_auto_rfq.kitchenset
       product_qty: 10

purchase_requisition_bid_selection/README.rst

@@ -1,3 +1,6 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :alt: License
+
 Purchase Requisition Bid Selection
 ==================================
 
@@ -28,9 +31,39 @@ A link has been added between a call for bids line and the corresponding line
 of each generated RFQ. This is used for the bids comparison in order to compare
 bid lines and group then properly.
 
+To proceed and validate bid selection, you can print the "Comparative Bid Analysis".
+This comparative report will only show eligible bids.
+
 For running the tests the nose python package is required.
 
+
 .. warning::
    Version prior to 0.4 was defining a `dest_address_id` field on Purchase
    Requisition. This field has been extracted in module
    `purchase_requisition_delivery_address`
+
+Credits
+=======
+
+* Jacques-Etienne Baudoux <je@bcim.be>
+* Joêl Grand-Guillaume <joel.grandguillaume@camptocamp.com>
+* Guewen Baconnier <guewen.baconnier@camptocamp.com>
+* Nicolas Bessi <nicolas.bessi@camptocamp.com>
+* Romain Deheele <romain.deheele@camptocamp.com>
+* Leonardo Pistone <leonardo.pistone@camptocamp.com>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
+* Pierre Verkest <pverkest@anybox.fr>
+
+Maintainer
+----------
+
+.. image:: http://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: http://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.

purchase_requisition_bid_selection/__openerp__.py

@@ -15,7 +15,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 {"name": "Purchase Requisition Bid Selection",
- "version": "2.0",
+ "version": "2.1",
  "author": "Camptocamp,Odoo Community Association (OCA)",
  "license": "AGPL-3",
  "category": "Purchase Management",
@@ -24,13 +24,16 @@
  "depends": ["purchase_requisition",
              "stock",  # For incoterms
              "purchase_rfq_bid_workflow",
+             "purchase_requisition_multicurrency",
              ],
  "demo": [],
  "data": ["wizard/modal.xml",
           "wizard/purchase_requisition_partner_view.xml",
-          "wizard/update_bid_selection_remark.xml",
+          "wizard/update_bid_internal_remark.xml",
           "view/purchase_requisition.xml",
           "view/purchase_order.xml",
+          "view/report_purchaserequisition.xml",
+          "report.xml",
           "workflow/purchase_order.xml",
           "workflow/purchase_requisition.xml",
           "data/purchase.cancelreason.yml",

purchase_requisition_bid_selection/i18n/purchase_requisition_bid_selection.pot

@@ -57,8 +57,8 @@ msgid "Bid partially selected"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
-#: field:update.bid.selection.remark,bid_selection_remark:0
-msgid "Bid selection remark"
+#: field:update.bid.internal.remark,bid_internal_remark:0
+msgid "Bid internal remark"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
@@ -101,7 +101,7 @@ msgstr ""
 #: view:purchase.action_modal:purchase_requisition_bid_selection.modal_confirm_close_selection
 #: view:purchase.action_modal.ask_selection_reasons:purchase_requisition_bid_selection.ask_selection_reasons
 #: view:purchase.requisition.partner:purchase_requisition_bid_selection.view_purchase_requisition_partner_draftbid
-#: view:update.bid.selection.remark:purchase_requisition_bid_selection.view_update_bid_selection_remark
+#: view:update.bid.internal.remark:purchase_requisition_bid_selection.view_update_bid_internal_remark
 msgid "Cancel"
 msgstr ""
 
@@ -141,13 +141,13 @@ msgstr ""
 
 #. module: purchase_requisition_bid_selection
 #: field:purchase.action_modal.ask_selection_reasons,create_uid:0
-#: field:update.bid.selection.remark,create_uid:0
+#: field:update.bid.internal.remark,create_uid:0
 msgid "Created by"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
 #: field:purchase.action_modal.ask_selection_reasons,create_date:0
-#: field:update.bid.selection.remark,create_date:0
+#: field:update.bid.internal.remark,create_date:0
 msgid "Created on"
 msgstr ""
 
@@ -215,7 +215,7 @@ msgstr ""
 
 #. module: purchase_requisition_bid_selection
 #: field:purchase.action_modal.ask_selection_reasons,id:0
-#: field:update.bid.selection.remark,id:0
+#: field:update.bid.internal.remark,id:0
 msgid "ID"
 msgstr ""
 
@@ -237,13 +237,13 @@ msgstr ""
 
 #. module: purchase_requisition_bid_selection
 #: field:purchase.action_modal.ask_selection_reasons,write_uid:0
-#: field:update.bid.selection.remark,write_uid:0
+#: field:update.bid.internal.remark,write_uid:0
 msgid "Last Updated by"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
 #: field:purchase.action_modal.ask_selection_reasons,write_date:0
-#: field:update.bid.selection.remark,write_date:0
+#: field:update.bid.internal.remark,write_date:0
 msgid "Last Updated on"
 msgstr ""
 
@@ -321,7 +321,7 @@ msgid "Re-Open Bids Selection"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
-#: view:update.bid.selection.remark:purchase_requisition_bid_selection.view_update_bid_selection_remark
+#: view:update.bid.internal.remark:purchase_requisition_bid_selection.view_update_bid_internal_remark
 msgid "Remark"
 msgstr ""
 
@@ -393,8 +393,8 @@ msgid "Selection reasons"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
-#: field:purchase.order,bid_selection_remark:0
-msgid "Selection remarks"
+#: field:purchase.order,bid_internal_remark:0
+msgid "Internal remarks"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
@@ -429,18 +429,18 @@ msgid "True if the bid has been partially selected"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
-#: model:ir.actions.act_window,name:purchase_requisition_bid_selection.action_update_bid_selection_remark
-msgid "Update bid selection remark"
+#: model:ir.actions.act_window,name:purchase_requisition_bid_selection.action_update_bid_internal_remark
+msgid "Update bid internal remark"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
-#: view:update.bid.selection.remark:purchase_requisition_bid_selection.view_update_bid_selection_remark
+#: view:update.bid.internal.remark:purchase_requisition_bid_selection.view_update_bid_internal_remark
 msgid "Update remark"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
 #: view:purchase.requisition:purchase_requisition_bid_selection.view_purchase_requisition_form
-msgid "Update selection remark"
+msgid "Update internal remark"
 msgstr ""
 
 #. module: purchase_requisition_bid_selection
@@ -501,7 +501,7 @@ msgstr ""
 #: view:purchase.action_modal:purchase_requisition_bid_selection.modal_confirm_close_selection
 #: view:purchase.action_modal.ask_selection_reasons:purchase_requisition_bid_selection.ask_selection_reasons
 #: view:purchase.requisition.partner:purchase_requisition_bid_selection.view_purchase_requisition_partner_draftbid
-#: view:update.bid.selection.remark:purchase_requisition_bid_selection.view_update_bid_selection_remark
+#: view:update.bid.internal.remark:purchase_requisition_bid_selection.view_update_bid_internal_remark
 msgid "or"
 msgstr ""
 

purchase_requisition_bid_selection/model/purchase_order.py

@@ -17,6 +17,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
+
 from openerp import models, fields, api, osv
 
 
@@ -52,7 +53,7 @@ class PurchaseOrder(models.Model):
     weight_estimated = fields.Float('Weight estimated (kg)')
     meets_specifications = fields.Boolean()
     bid_eligible = fields.Boolean()
-    bid_selection_remark = fields.Text('Selection remarks')
+    bid_internal_remark = fields.Text('Internal remarks')
 
     @api.model
     def _prepare_purchase_order(self, requisition, supplier):

purchase_requisition_bid_selection/model/purchase_requisition.py

@@ -116,7 +116,7 @@ class PurchaseRequisition(models.Model):
              "specific to public sector).")
     delivery_remark = fields.Text('Delivery Remarks')
     budget = fields.Float()
-    selection_reasons = fields.Text()
+    selection_reasons = fields.Text(copy=False)
 
     @api.multi
     def _has_product_lines(self):

purchase_requisition_bid_selection/report.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <report
+      string="Comparative Bid Analysis"
+      id="action_report_purchase_requisitions"
+      model="purchase.requisition"
+      report_type="qweb-pdf"
+      name="purchase_requisition_bid_selection.report_purchaserequisitions"
+      file="purchase_requisition_bid_selection.report_purchaserequisitions"
+      />
+  </data>
+  <data noupdate="1">
+    <record id="paperformat_bid_selection" model="report.paperformat">
+      <field name="name">Bid selection</field>
+      <field name="orientation">Landscape</field>
+      <field name="margin_top">5</field>
+      <field name="margin_bottom">15</field>
+      <field name="header_spacing">0</field>
+    </record>
+
+    <record id="action_report_purchase_requisitions" model="ir.actions.report.xml">
+      <field name="paperformat_id" ref="paperformat_bid_selection"/>
+    </record>
+
+  </data>
+</openerp>

purchase_requisition_bid_selection/test/process/restricted.yml

@@ -8,6 +8,7 @@
     bid_tendering_mode: 'restricted'
     schedule_date: '2013-09-30'
     req_validity: '2013-09-10'
+    pricelist_id: purchase.list0
     line_ids:
       - product_id: product.product_product_15
         product_qty: 15.0

purchase_requisition_bid_selection/tests/test_generate_po.py

@@ -40,7 +40,8 @@ def setUp(self):
                 'purchase_requisition_bid_selection.act_closed').id,
             'condition': True,
         })
-        self.preq = PReq.create({'state': 'closed'})
+        self.preq = PReq.create({'state': 'closed',
+                                 'pricelist_id': self.ref('purchase.list0')})
         dummy_wkf_trans.unlink()
 
         partner_12 = self.env.ref('base.res_partner_12')

purchase_requisition_bid_selection/view/purchase_requisition.xml

@@ -9,7 +9,7 @@
     <record model="ir.ui.view" id="view_purchase_requisition_form">
       <field name="name">purchase.requisition.form.inherit</field>
       <field name="model">purchase.requisition</field>
-      <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_form"/>
+      <field name="inherit_id" ref="purchase_requisition_multicurrency.view_purchase_requisition_form"/>
       <field name="arch" type="xml">
 
         <xpath expr="//header/field[@name='state']" position="attributes">
@@ -22,7 +22,7 @@
         </xpath>
 
         <xpath expr="//sheet//button[@name='open_product_line']" position="attributes">
-          <!-- add the state 'closed' -->
+          <!-- add states 'selected' and 'closed' -->
           <attribute name="attrs">{'invisible': ['|', ('state', 'not in', ('open','selected','closed','done')), ('exclusive', '=', 'exclusive')]}</attribute>
         </xpath>
 
@@ -32,17 +32,20 @@
 
         <xpath expr="//field[@name='user_id']" position="after">
           <field name="bid_tendering_mode" attrs="{'readonly': [('state','not in',('draft'))]}" />
-          <field name="pricelist_id" attrs="{'readonly': [('state','not in',('draft'))]}"/>
           <field name="budget"/>
         </xpath>
 
+        <xpath expr="//field[@name='pricelist_id']" position="attributes">
+          <attributes name="attrs">{'readonly': [('state','not in',('draft'))]}</attributes>
+        </xpath>
+
         <separator string="Requests for Quotation" position="attributes">
           <attribute name="string">Requests for Quotation / Bids</attribute>
         </separator>
 
         <xpath expr="//field[@name='purchase_ids']//field[@name='state']" position="after">
-          <field name="bid_selection_remark"/>
-          <button name="%(action_update_bid_selection_remark)d" type="action" string="Update selection remark" icon="gtk-ok"/>
+          <field name="bid_internal_remark"/>
+          <button name="%(action_update_bid_internal_remark)d" type="action" string="Update internal remark" icon="gtk-ok"/>
         </xpath>
 
         <xpath expr="//field[@name='purchase_ids']" position="after">