From eace69d07d72d87de1c90d94e6502ecb9517a61f Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 15 Jun 2015 11:55:22 +0200
Subject: [PATCH] [IMP] purchase : Several usability improvements - Remove the
 Bid notebook on the purchase order form. - Add a message on the chatter to
 display the field Bid Received On - Move the field Bid Valid Until under the
 Order Date field, displayed only if Bid Received on is filled. - Remove
 Invoice Received Checkbox, as there is now a stat button to display the
 information - Add a default filter "To Do" on the RFQ and purchase order
 views, which displayed all the record not in the states done or cancelled. -
 Changed several labels, and reorganized some options in the configuration.

---
 addons/purchase/purchase.py         |  4 +++-
 addons/purchase/purchase_view.xml   | 14 +++++---------
 addons/purchase/res_config.py       |  2 +-
 addons/purchase/res_config_view.xml |  5 -----
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 491fb5a1f0f..280bf2b5be6 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -480,7 +480,9 @@ class purchase_order(osv.osv):
         return True
 
     def wkf_bid_received(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'bid', 'bid_date': fields.date.context_today(self,cr,uid,context=context)})
+        bid_date = fields.date.context_today(self, cr, uid, context=context)
+        self.message_post(cr, uid, ids, body=_("Bid received on %s") % (bid_date), context=context)
+        return self.write(cr, uid, ids, {'state':'bid', 'bid_date': bid_date})
 
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         '''
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 95caccf0843..8f8f0d86951 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -224,6 +224,8 @@
                             <field name="origin" attrs="{'invisible': [('origin','=',False)]}"/>
                             <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                             <field name="related_usage" invisible="1"/>
+                            <field name="bid_date" invisible="1"/>
+                            <field name="bid_validity" attrs="{'invisible':[('bid_date','=',False)]}"/>
                             <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id, context)"
                                 attrs="{'invisible':[('related_usage','!=','customer')],
                                 'required': [('related_usage','=', 'customer')]}"
@@ -267,12 +269,6 @@
                             <field name="notes" class="oe_inline" placeholder="An administrator can set up default Terms and conditions in your Company settings."/>
                             <div class="oe_clear"/>
                         </page>
-                        <page string="Bid">
-                            <group>
-                                <field name="bid_date"/>
-                                <field name="bid_validity"/>
-                            </group>
-                        </page>
                         <page string="Deliveries &amp; Invoices">
                             <group>
                                 <group>
@@ -284,7 +280,6 @@
                                 </group>
                                 <group>
                                     <field name="invoice_method"/>
-                                    <field name="invoiced"/>
                                     <field name="payment_term_id" options="{'no_open': True, 'no_create': True}"/>
                                     <field name="fiscal_position_id" attrs="{'readonly': [('invoiced','=', True)]}" />
                                     <!-- We do not need these fields anymore, the information is in open chatter -->
@@ -337,6 +332,7 @@
                     <field name="create_uid"/>
                     <filter name="draft" string="Quotations" domain="[('state','in',('draft','sent'))]"/>
                     <filter name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]"/>
+                    <filter name="todo" string="To Do" domain="[('state','not in',('cancel','done'))]"/>
                     <filter name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]"/>
                     <separator/>
                     <filter name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]"/>
@@ -411,7 +407,7 @@
             <field name="name">Requests for Quotation</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_todo':1}</field>
             <field name="domain">[('state','in',('draft','sent','bid','cancel', 'confirmed'))]</field>
             <field name="view_mode">tree,kanban,form,pivot,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
@@ -437,7 +433,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,kanban,form,pivot,graph,calendar</field>
-            <field name="context">{}</field>
+            <field name="context">{'search_default_todo':1}</field>
             <field name="domain">[('state','not in',('draft','sent','bid', 'confirmed'))]</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 2e2ac07e1a3..3fd5b153dbb 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -21,7 +21,7 @@ class purchase_config_settings(osv.osv_memory):
         'group_uom':fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_costing_method':fields.boolean("Use 'Real Price' or 'Average' costing methods.",
+        'group_costing_method':fields.boolean("Use 'Real Price' and 'Average' costing methods.",
             implied_group='stock_account.group_inventory_valuation',
             help="""Allows you to compute product cost price based on average cost."""),
         'module_warning': fields.boolean("Alerts by products or supplier",
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 7a1246a264b..351cc214922 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -41,11 +41,6 @@
                             <div>
                                 <field name="module_warning" class="oe_inline"/>
                                 <label for="module_warning"/>
-                                <span class="oe_grey">
-                                    <p attrs="{'invisible': [('module_warning','=',False)]}">
-                                        The Sales Management module will also be installed.
-                                    </p>
-                                </span>
                             </div>
                         </div>
                     </group>