odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account,sale,purchase: edi - generate canonical report printout when exporting 

bzr revid: odo@openerp.com-20111010143806-wxxdoheg562mo8re
This commit is contained in:
Olivier Dony 2011-10-10 16:38:06 +02:00
parent 1e80c28ef1
commit b3276b708c
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/account/edi/invoice.py
View File

@ -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),

3
addons/purchase/edi/purchase_order.py
View File

@ -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({

8
addons/purchase/purchase_report.xml
View File

@ -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>

5
addons/sale/edi/sale_order.py
View File

@ -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 = []

4
addons/sale/sale_report.xml
View File

@ -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>