From 970559feaffce71de250aa97582c5889e72aef82 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 19 Jun 2013 14:59:51 +0200
Subject: [PATCH] [FIX]purchase_requisition: rename request for tender into
 call for bids + typo

bzr revid: csn@openerp.com-20130619125951-4vuxoe1c3ume7dlh
---
 .../purchase_requisition.py                   | 10 +++++-----
 .../purchase_requisition_view.xml             | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index afadc62891b..6f6862c6f8f 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -47,8 +47,8 @@ class purchase_requisition(osv.osv):
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
         'origin': fields.char('Source Document', size=32),
-        'date_start': fields.datetime('Requisition Date'),
-        'date_end': fields.datetime('Requisition Deadline'),
+        'date_start': fields.datetime('Date'),
+        'date_end': fields.datetime('Bid Submission Deadline'),
         '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.\nPurchase Requisition(Multiple):  It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
@@ -332,7 +332,7 @@ class purchase_requisition_line(osv.osv):
         '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')),
         'po_line_buy': fields.many2one('purchase.order.line', 'Purchase Order Line'),
-        'requisition_id': fields.many2one('purchase.requisition','Request for Tender', ondelete='cascade'),
+        'requisition_id': fields.many2one('purchase.requisition','Call for Bids', ondelete='cascade'),
         'po_line_ids': fields.related('requisition_id', 'po_line_ids', string='PO lines', readonly=True, type="one2many"),
         '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',),
@@ -364,7 +364,7 @@ class purchase_order(osv.osv):
     _inherit = "purchase.order"
 
     _columns = {
-        'requisition_id' : fields.many2one('purchase.requisition','Request for Tender'),
+        'requisition_id' : fields.many2one('purchase.requisition','Call for Bids'),
     }
 
     def wkf_confirm_order(self, cr, uid, ids, context=None):
@@ -419,7 +419,7 @@ class product_product(osv.osv):
     _inherit = 'product.product'
 
     _columns = {
-        'purchase_requisition': fields.boolean('Requests for Tender', help="Check this box to generate requests for tender instead of generating requests for quotation from procurement.")
+        'purchase_requisition': fields.boolean('Call for Bids', help="Check this box to generate Call for Bids instead of generating requests for quotation from procurement.")
     }
     _defaults = {
         'purchase_requisition': False
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 87c6bf3c6cb..b4b7b623252 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -28,7 +28,7 @@
         <field name="name">purchase.requisition.form</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <form string="Request for Tender" version="7.0">
+            <form string="Call for Bids" version="7.0">
             <header>              
                 <button name="sent_suppliers" states="draft" string="Confirm Tender" class="oe_highlight"/>
                 <button name="open_bid" states="in_progress" string="Close Bids" class="oe_highlight"/>
@@ -125,7 +125,7 @@
         <field name="name">purchase.requisition.tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:message_unread==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Request for Tender">
+            <tree fonts="bold:message_unread==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Call for Bids">
                 <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="date_start"/>
@@ -142,12 +142,12 @@
             <field name="name">purchase.requisition.list.select</field>
             <field name="model">purchase.requisition</field>
             <field name="arch" type="xml">
-                <search string="Search Request for Tender">
-                    <field name="name" string="Request for Tender"/>
+                <search string="Search Call for Bids">
+                    <field name="name" string="Call for Bids"/>
                     <field name="exclusive" />
-                    <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Request for Tender"/>
-                    <filter icon="terp-camera_test" string="Sent to Suppliers" domain="[('state','=','in_progress')]" help="Request for Tender in negociation"/>
-                    <filter icon="terp-dialog-close" string="Purchase Done" domain="[('state','=','done')]" help="Current Request for Tender"/>
+                    <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Call for Bids"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','in_progress')]" help="Call for Bids in negociation"/>
+                    <filter icon="terp-dialog-close" string="Closed Bids" domain="[('state','=','open')]" help="Call for Bids where bids are closed"/>
                     <separator/>
                     <filter icon="terp-personal-" string="Unassigned"  domain="[('user_id','=', False)]" help="Unassigned  Requisition"/>
                     <field name="user_id" />
@@ -164,7 +164,7 @@
 
 
     <record model="ir.actions.act_window" id="action_purchase_requisition">
-        <field name="name">Requests for Tender</field>
+        <field name="name">Call for Bids</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
@@ -173,9 +173,9 @@
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
-            Click to start a new request for tender process. 
+            Click to start a new Call for Bids process. 
           </p><p>
-            A request for tender is the step before a request for quotation.
+            A Call for Bids is the step before a request for quotation.
             In a purchase requisition (or purchase tender), you can record the
             products you need to buy and trigger the creation of RfQs to
             suppliers. After the negotiation, once you have reviewed all the