diff options
| author | Olivier Dony <odo@openerp.com> | 2014-07-01 12:28:55 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-07-01 12:28:55 +0200 |
| commit | 5b83e88c256b5ab219e482969f903e253a96daae (patch) | |
| tree | 86514fada7597dda99d01294d2bd913f3094b86e | |
| parent | 18bbd757f0b67f059065e8c4e92809db57b15691 (diff) | |
| parent | 3d3134108d51462474a9323903fe5b549aac0119 (diff) | |
[MERGE] Fwd-port of 7.0 up to 3d31341
| -rw-r--r-- | addons/web_linkedin/web_linkedin.py | 2 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_partner.py | 2 | ||||
| -rw-r--r-- | openerp/report/render/rml2pdf/trml2pdf.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py index 83132511a17..a0919f7968e 100644 --- a/addons/web_linkedin/web_linkedin.py +++ b/addons/web_linkedin/web_linkedin.py @@ -34,7 +34,7 @@ class Binary(openerp.http.Controller): _scheme, _netloc, path, params, query, fragment = urlparse(url) # media.linkedin.com is the master domain for LinkedIn media (replicated to CDNs), # so forcing it should always work and prevents abusing this method to load arbitrary URLs - url = urlunparse(('http', 'media.linkedin.com', path, params, query, fragment)) + url = urlunparse(('http', 'media.licdn.com', path, params, query, fragment)) bfile = urllib2.urlopen(url) return base64.b64encode(bfile.read()) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 896f455a274..98f3866cebf 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -577,7 +577,7 @@ class res_partner(osv.osv, format_address): """ Supported syntax: - 'Raoul <raoul@grosbedon.fr>': will find name and email address - otherwise: default, everything is set as the name """ - emails = tools.email_split(text) + emails = tools.email_split(text.replace(' ',',')) if emails: email = emails[0] name = text[:text.index(email)].replace('"', '').replace('<', '').strip() diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 38308209999..0dca38cec68 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -1005,10 +1005,10 @@ class _rml_template(object): story_cnt = 0 for node_story in node_stories: if story_cnt > 0: + # Reset Page Number with new story tag + fis.append(PageReset()) fis.append(platypus.PageBreak()) fis += r.render(node_story) - # Reset Page Number with new story tag - fis.append(PageReset()) story_cnt += 1 try: if self.localcontext and self.localcontext.get('internal_header',False): |