From 14aeec7c33ce8b6f3d8e0ce49a11d49abb9bea62 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 21 Jun 2013 11:23:40 +0200
Subject: [PATCH] [FIX]purchase_requisition report, TYPO on mail template and
 fix rfq action menu to also show cancel rfq

bzr revid: csn@openerp.com-20130621092340-1qy6jfynszz09jan
---
 .../edi/purchase_order_action_data.xml        | 10 +++----
 addons/purchase/purchase_view.xml             |  2 +-
 .../report/purchase_requisition.rml           | 30 ++++++++++++-------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index ca206851170..c920437f2b4 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -18,7 +18,7 @@
     <data noupdate="1">
         <!--Email template -->
         <record id="email_template_edi_purchase" model="email.template">
-            <field name="name">RFQ - Send by mail</field>
+            <field name="name">RFQ - Send by Email</field>
             <field name="email_from">${object.validator.email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
             <field name="email_recipients">${object.partner_id.id}</field>
@@ -36,10 +36,10 @@
     
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
-       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />
-       &nbsp;&nbsp;Order date: ${object.date_order}<br />
+       &nbsp;&nbsp;RFQ number: <strong>${object.name}</strong><br />
+       &nbsp;&nbsp;RFQ date: ${object.date_order}<br />
        % if object.origin:
-       &nbsp;&nbsp;Order reference: ${object.origin}<br />
+       &nbsp;&nbsp;RFQ reference: ${object.origin}<br />
        % endif
        % if object.partner_ref:
        &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />
@@ -92,7 +92,7 @@
 
         <!--Email template -->
         <record id="email_template_edi_purchase_done" model="email.template">
-            <field name="name">Purchase Order - Send by mail</field>
+            <field name="name">Purchase Order - Send by Email</field>
             <field name="email_from">${object.validator.email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
             <field name="email_recipients">${object.partner_id.id}</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 129b2b8cabb..0f4aebcb5fe 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -344,7 +344,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="context">{}</field>
-            <field name="domain">[('state','in',('draft','sent','bid'))]</field>
+            <field name="domain">[('state','in',('draft','sent','bid','cancel'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index 6e1eee134bf..a3185a53ee3 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="Request for Tender.pdf">
-  <template title="Request for Tender" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+<document filename="Call for Bids.pdf">
+  <template title="Call for Bids" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -50,6 +50,7 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
@@ -57,6 +58,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -132,20 +134,20 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Request for Tender [[ requisition.name ]]</para>
+    <para style="terp_header">Call for Bid [[ requisition.name ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Requisition Reference</para>
+          <para style="terp_tblheader_General_Centre">Call for Bid Reference</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Requisition Date</para>
+          <para style="terp_tblheader_General_Centre">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Type</para>
+          <para style="terp_tblheader_General_Centre">Selection Type</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Source</para>
@@ -172,7 +174,7 @@
       <font color="white"> </font>
     </para>
     <para style="terp_tblheader_Details">Product Detail [[ requisition.line_ids==[] and removeParentNode('para') ]]</para>
-    <blockTable colWidths="375.0,71.0,84.0" style="Table4">
+    <blockTable colWidths="275.0,71.0,84.0,100.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description [[ requisition.line_ids==[] and removeParentNode('blockTable') ]]</para>
@@ -183,11 +185,14 @@
         <td>
           <para style="terp_tblheader_Details_Centre">Product UoM</para>
         </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Schedule Date</para>
+        </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_2">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
-      <blockTable colWidths="375.0,71.0,84.0" style="Table5">
+      <blockTable colWidths="275.0,71.0,84.0,100.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ (line_ids.product_id and line_ids.product_id.code) or '' ]] ] [[ (line_ids.product_id and line_ids.product_id.name) or '' ]]</para>
@@ -198,23 +203,26 @@
           <td>
             <para style="terp_default_Centre_9">[[ (line_ids.product_uom_id and line_ids.product_uom_id.category_id and line_ids.product_uom_id.category_id.name) or '' ]]</para>
           </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids.schedule_date,date='True') ]]</para>
+          </td>
         </tr>
       </blockTable>
     </section>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_tblheader_Details">Quotation Detail [[ requisition.purchase_ids ==[] and removeParentNode('para') ]]</para>
+    <para style="terp_tblheader_Details">Request for Quotation [[ requisition.purchase_ids ==[] and removeParentNode('para') ]]</para>
     <blockTable colWidths="337.0,96.0,97.0" style="Table6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Supplier [[ requisition.purchase_ids ==[] and removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Date Ordered</para>
+          <para style="terp_tblheader_Details_Centre">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Order Reference</para>
+          <para style="terp_tblheader_Details_Centre">Reference</para>
         </td>
       </tr>
     </blockTable>