From b3276b708cafb91aa185617249dd674174d1b8f4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 10 Oct 2011 16:38:06 +0200
Subject: [PATCH] [IMP] account,sale,purchase: edi - generate canonical report
 printout when exporting

bzr revid: odo@openerp.com-20111010143806-wxxdoheg562mo8re
---
 addons/account/edi/invoice.py         | 3 +++
 addons/purchase/edi/purchase_order.py | 3 +++
 addons/purchase/purchase_report.xml   | 8 ++++++--
 addons/sale/edi/sale_order.py         | 5 ++++-
 addons/sale/sale_report.xml           | 4 +++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index 817bf583516..15fd1327db3 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -69,6 +69,9 @@ class account_invoice(osv.osv, EDIMixin):
         res_partner_address = self.pool.get('res.partner.address')
         edi_doc_list = []
         for invoice in records:
+            # generate the main report
+            self._edi_generate_report_attachment(cr, uid, invoice, context=context)
+
             edi_doc = super(account_invoice,self).edi_export(cr, uid, [invoice], edi_struct, context)[0]
             edi_doc.update({
                     'company_address': res_company.edi_export_address(cr, uid, invoice.company_id, context=context),
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index 4ac25adf23b..2bf823707a7 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -60,6 +60,9 @@ class purchase_order(osv.osv, EDIMixin):
         res_partner_address = self.pool.get('res.partner.address')
         edi_doc_list = []
         for order in records:
+            # generate the main report
+            self._edi_generate_report_attachment(cr, uid, order, context=context)
+
             # Get EDI doc based on struct. The result will also contain all metadata fields and attachments.
             edi_doc = super(purchase_order,self).edi_export(cr, uid, [order], edi_struct, context)[0]
             edi_doc.update({
diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml
index e13ca9911b0..a3a4a6a70b6 100644
--- a/addons/purchase/purchase_report.xml
+++ b/addons/purchase/purchase_report.xml
@@ -1,7 +1,11 @@
 <?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" string="Purchase Order"/>
+        <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"/>
     </data>
 </openerp>
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index d262cbb9255..d7ece92717a 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -60,6 +60,9 @@ class sale_order(osv.osv, EDIMixin):
         res_partner_address = self.pool.get('res.partner.address')
         edi_doc_list = []
         for order in records:
+            # generate the main report
+            self._edi_generate_report_attachment(cr, uid, order, context=context)
+
             # Get EDI doc based on struct. The result will also contain all metadata fields and attachments.
             edi_doc = super(sale_order,self).edi_export(cr, uid, [order], edi_struct, context)[0]
             edi_doc.update({
@@ -177,7 +180,7 @@ class sale_order_line(osv.osv, EDIMixin):
     _inherit='sale.order.line'
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
-        """Overridden to provides sale order line fields with the expected names
+        """Overridden to provide sale order line fields with the expected names
            (sale and purchase orders have different column names)"""
         edi_struct = dict(edi_struct or SALE_ORDER_LINE_EDI_STRUCT)
         edi_doc_list = []
diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml
index 33819df0bde..0f77913a3c9 100644
--- a/addons/sale/sale_report.xml
+++ b/addons/sale/sale_report.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/sale_order.rml" string="Quotation / Order"/>
+        <report auto="False" id="report_sale_order" model="sale.order" name="sale.order"
+                rml="sale/report/sale_order.rml" string="Quotation / Order"
+                usage="default"/>
 
     </data>
 </openerp>