diff --git a/addons/edi/static/src/xml/edi_sale_purchase.xml b/addons/edi/static/src/xml/edi_sale_purchase.xml
index 95f3a39936f..a34158a6189 100644
--- a/addons/edi/static/src/xml/edi_sale_purchase.xml
+++ b/addons/edi/static/src/xml/edi_sale_purchase.xml
@@ -116,37 +116,39 @@
 </div>
 </t>
 <t t-name="Edi.sale.order.sidebar">
-    <t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
-        <p class="oe_edi_sidebar_title">Pay Online</p>
-        <t t-if="doc.company_address.paypal_account">
-            <div class="oe_edi_option">
-                <input type="radio" id="oe_edi_paypal" name="oe_edi_pay" class="oe_edi_pay_choice"/>
-                <label for="oe_edi_paypal" id="oe_edi_paypal" class="oe_edi_pay_choice_label">Paypal</label>
-            </div>
-            <p class="oe_edi_nested_block_pay oe_edi_paypal_nested">
-                You may directly pay this order online via Paypal's secure payment gateway:<br/>
-                <a t-att-href="widget.get_paypal_url('Sale Order','name')" target="_new">
-                    <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
-                </a>
-            </p>
-        </t>
-        <t t-if="doc.company_address.bank_ids">
-            <div class="oe_edi_option">
-                <input type="radio" id="oe_edi_pay_wire" name="oe_edi_pay" class="oe_edi_pay_choice"/>
-                <label for="oe_edi_pay_wire" id="oe_edi_pay_wire" class="oe_edi_pay_choice_label">Bank Wire Transfer</label>
-            </div>
-            <p class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
-                Please transfer <strong><t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
-                <strong><t t-esc="doc.company_id[1]"/></strong> (postal address on the order header)
-                 using one of the following bank accounts. Be sure to mention the document
-                 reference <strong><t t-esc="doc.name"/></strong> on the transfer:
-                 <br/><br/>
-            </p>
-            <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
-            <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
-                <li><t t-esc="bank_info[1]"/></li>
+    <t t-if="!doc.order_policy || doc.order_policy == 'prepaid'">
+        <t t-if="doc.company_address.paypal_account || doc.company_address.bank_ids">
+            <p class="oe_edi_sidebar_title">Pay Online</p>
+            <t t-if="doc.company_address.paypal_account">
+                <div class="oe_edi_option">
+                    <input type="radio" id="oe_edi_paypal" name="oe_edi_pay" class="oe_edi_pay_choice"/>
+                    <label for="oe_edi_paypal" id="oe_edi_paypal" class="oe_edi_pay_choice_label">Paypal</label>
+                </div>
+                <p class="oe_edi_nested_block_pay oe_edi_paypal_nested">
+                    You may directly pay this order online via Paypal's secure payment gateway:<br/>
+                    <a t-att-href="widget.get_paypal_url('Sale Order','name')" target="_new">
+                        <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+                    </a>
+                </p>
+            </t>
+            <t t-if="doc.company_address.bank_ids">
+                <div class="oe_edi_option">
+                    <input type="radio" id="oe_edi_pay_wire" name="oe_edi_pay" class="oe_edi_pay_choice"/>
+                    <label for="oe_edi_pay_wire" id="oe_edi_pay_wire" class="oe_edi_pay_choice_label">Bank Wire Transfer</label>
+                </div>
+                <p class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                    Please transfer <strong><t t-esc="_.sprintf('%.2f',doc.amount_total)"/> <t t-esc="doc.currency.code"/></strong> to
+                    <strong><t t-esc="doc.company_id[1]"/></strong> (postal address on the order header)
+                     using one of the following bank accounts. Be sure to mention the document
+                     reference <strong><t t-esc="doc.name"/></strong> on the transfer:
+                     <br/><br/>
+                </p>
+                <ul class="oe_edi_nested_block_pay oe_edi_pay_wire_nested">
+                <t t-foreach="doc.company_address.bank_ids" t-as="bank_info">
+                    <li><t t-esc="bank_info[1]"/></li>
+                </t>
+                </ul>
             </t>
-            </ul>
         </t>
     </t>
 </t>
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index 9fd332ed345..1b3c437f015 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -57,6 +57,7 @@ SALE_ORDER_EDI_STRUCT = {
     'amount_untaxed': True,
     'amount_tax': True,
     'payment_term': True,
+    'order_policy': True,
 }
 
 class sale_order(osv.osv, EDIMixin):
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 4afc7c508af..e52778ddde4 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -56,7 +56,7 @@
             <a style="display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;" 
                href="${ctx.get('edi_web_url_view') or ''}">View Order</a>
 
-    % if object.company_id.paypal_account:
+    % if object.order_policy == 'prepaid' and object.company_id.paypal_account:
     <%
     comp_name = quote(object.company_id.name)
     order_name = quote(object.name)
@@ -131,7 +131,7 @@ Your order for ${object.partner_id.name} has just been validated:
 You can view the order confirmation, download it and even pay online using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
 
-% if object.company_id.paypal_account:
+% if object.order_policy == 'prepaid' and object.company_id.paypal_account:
 <% 
 comp_name = quote(object.company_id.name)
 order_name = quote(object.name)
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 294a1c29c00..3bd4e101e86 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -217,7 +217,7 @@ class sale_order(osv.osv):
         'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
 
         'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
-        'picking_policy': fields.selection([('direct', 'Deliver each products when available'), ('one', 'Deliver all products at once')],
+        'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
             'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
             ('prepaid', 'Pay before delivery'),