diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index a34158a6189..2a3d656bd88 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -45,7 +45,7 @@
         <tr class="oe_edi_data_row">
             <td align="left"><t t-if="doc.partner_ref" t-esc="doc.partner_ref"/></td>
             <td align="left"><t t-esc="doc.date_order"/></td>
-            <td align="left">TODO</td>
+            <td align="left"><t t-if="doc.user_id" t-esc="doc.user_id[1]"/></td>
             <td align="left">
                 <t t-if="doc.payment_term" t-esc="doc.payment_term[1]"/>
             </td>
diff --git a/addons/purchase/edi/purchase_order.py b/addons/purchase/edi/purchase_order.py
index d6909b381fc..87b480b7802 100644
--- a/addons/purchase/edi/purchase_order.py
+++ b/addons/purchase/edi/purchase_order.py
@@ -178,6 +178,8 @@ class purchase_order(osv.osv, EDIMixin):
         edi_document.pop('amount_tax', None)
         edi_document.pop('amount_untaxed', None)
         edi_document.pop('payment_term', None)
+        edi_document.pop('order_policy', None)
+        edi_document.pop('user_id', None)
 
         for order_line in edi_document['order_line']:
             self._edi_requires_attributes(('date_planned', 'product_id', 'product_uom', 'product_qty', 'price_unit'), order_line)
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index 1b3c437f015..efa037e6978 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -58,6 +58,7 @@ SALE_ORDER_EDI_STRUCT = {
     'amount_tax': True,
     'payment_term': True,
     'order_policy': True,
+    'user_id': True,
 }
 
 class sale_order(osv.osv, EDIMixin):
@@ -88,7 +89,6 @@ class sale_order(osv.osv, EDIMixin):
                                                                          context=context)[0],
                     'partner_ref': order.client_order_ref or False,
                     'notes': order.note or False,
-                    #TODO: company_logo
             })
             edi_doc_list.append(edi_doc)
         return edi_doc_list