Merge lp:~openerp-dev/openobject-addons/trunk-bug-1081729-kbh into lp:openobject-addons

[Khushboo Bhatt(openerp)]

Hello,

  now there is only one menu for printing quotation or confirmed purchase order.

Thanks,
Khushboo

Unmerged revisions

8184. By Khushboo Bhatt(openerp) on 2012-12-03

[FIX]purchase:report name for quatation and PO

=== modified file 'purchase/edi/purchase_order_action_data.xml'
--- purchase/edi/purchase_order_action_data.xml	2012-11-23 06:26:18 +0000
+++ purchase/edi/purchase_order_action_data.xml	2012-12-03 08:14:24 +0000
@@ -24,7 +24,7 @@
             <field name="email_recipients">${object.partner_id.id}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
-            <field name="report_template" ref="report_purchase_quotation"/>
+            <field name="report_template" ref="report_purchase_order"/>
             <field name="report_name">RFQ_${(object.name or '').replace('/','_')}</field>
             <field name="body_html"><![CDATA[
 <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); ">

=== modified file 'purchase/purchase_report.xml'
--- purchase/purchase_report.xml	2011-10-10 14:38:06 +0000
+++ purchase/purchase_report.xml	2012-12-03 08:14:24 +0000
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="report_purchase_quotation" model="purchase.order" 
-                name="purchase.quotation" rml="purchase/report/request_quotation.rml"
-                string="Request for Quotation"/>
         <report auto="False" id="report_purchase_order" model="purchase.order"
                 name="purchase.order" rml="purchase/report/order.rml"
-                usage="default" string="Purchase Order"/>
+                usage="default" string="Quotation / Order"/>
     </data>
 </openerp>