From 90dd7cb5df6b73a7bf9ace98f974649624f19ec9 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Sat, 5 Nov 2011 02:56:31 +0100 Subject: [PATCH] [FIX] edi: override __import_model for SO/PO lines too bzr revid: odo@openerp.com-20111105015631-ox7gma2i5v9b3hjm --- addons/purchase/edi/purchase_order.py | 6 +++--- addons/sale/edi/sale_order.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py index baa11a6fdfb..235b02645ed 100644 --- a/addons/purchase/edi/purchase_order.py +++ b/addons/purchase/edi/purchase_order.py @@ -79,13 +79,13 @@ class purchase_order(osv.osv, EDIMixin): '__import_module': 'sale', 'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context), - 'company_paypal_account': order.company_id.paypal_account, 'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_address_id], context=context)[0], - 'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id], context=context)[0], - #'company_logo': #TODO }) + if edi_doc.get('order_line'): + for line in edi_doc['order_line']: + line['__import_model'] = 'sale.order.line' edi_doc_list.append(edi_doc) return edi_doc_list diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py index 3fcff236a3b..d40d0b613ed 100644 --- a/addons/sale/edi/sale_order.py +++ b/addons/sale/edi/sale_order.py @@ -82,7 +82,6 @@ class sale_order(osv.osv, EDIMixin): '__import_module': 'purchase', 'company_address': res_company.edi_export_address(cr, uid, order.company_id, context=context), - 'company_paypal_account': order.company_id.paypal_account, 'partner_address': res_partner_address.edi_export(cr, uid, [order.partner_order_id], context=context)[0], 'currency': self.pool.get('res.currency').edi_export(cr, uid, [order.pricelist_id.currency_id], @@ -206,6 +205,7 @@ class sale_order_line(osv.osv, EDIMixin): edi_doc_list = [] for line in records: edi_doc = super(sale_order_line,self).edi_export(cr, uid, [line], edi_struct, context)[0] + edi_doc['__import_model'] = 'purchase.order.line' edi_doc['product_qty'] = line.product_uom_qty if line.product_uos: edi_doc.update(product_uom=line.product_uos,