From d88ecfa970fbd66507180ec3e8a970ca8c0613be Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 20 May 2014 10:16:17 +0200
Subject: [PATCH] [FIX] sale: in paypal, the encoding of the url should be done
 with werkzeug instead of urllib for better handeling of unicode (opw 607866)

---
 addons/account/edi/invoice.py | 4 ++--
 addons/sale/edi/sale_order.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index 2c2a754de3b..c82d041ef85 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -21,7 +21,7 @@
 from openerp.osv import osv, fields
 from openerp.addons.edi import EDIMixin
 
-from urllib import urlencode
+from werkzeug import url_encode
 
 INVOICE_LINE_EDI_STRUCT = {
     'name': True,
@@ -274,7 +274,7 @@ class account_invoice(osv.osv, EDIMixin):
                     "no_note": "1",
                     "bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name,
                 }
-                res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
+                res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + url_encode(params)
         return res
 
     _columns = {
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index bf015b3cdfc..cd1b18ef9b5 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -22,7 +22,7 @@ from openerp.osv import osv, fields
 from openerp.addons.edi import EDIMixin
 from openerp.tools.translate import _
 
-from urllib import urlencode
+from werkzeug import url_encode
 
 SALE_ORDER_LINE_EDI_STRUCT = {
     'sequence': True,
@@ -197,7 +197,7 @@ class sale_order(osv.osv, EDIMixin):
                     "no_note": "1",
                     "bn": "OpenERP_Order_PayNow_" + order.pricelist_id.currency_id.name,
                 }
-                res[order.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params)
+                res[order.id] = "https://www.paypal.com/cgi-bin/webscr?" + url_encode(params)
         return res
 
     _columns = {