From d8a0e3d29a6d64822f703027e34238cdd8e0ea2e Mon Sep 17 00:00:00 2001 From: Nicolas Bessi Date: Fri, 27 Jun 2014 14:19:34 +0200 Subject: [PATCH 1/4] Fix wrong relative import of hr_payroll --- addons/l10n_in_hr_payroll/report/report_payslip_details.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py index 462bb374287..37cb7c2a0b7 100644 --- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py +++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py @@ -20,7 +20,7 @@ ############################################################################## from openerp.report import report_sxw -from hr_payroll import report +from openerp.addons.hr_payroll import report class payslip_details_report_in(report.report_payslip_details.payslip_details_report): @@ -32,4 +32,4 @@ class payslip_details_report_in(report.report_payslip_details.payslip_details_re report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in) -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From df40926d2a57c101a3e2d221ecfd08fbb4fea30e Mon Sep 17 00:00:00 2001 From: Jacques-Etienne Baudoux Date: Fri, 27 Jun 2014 16:47:20 +0200 Subject: [PATCH 2/4] [IMP] res_partner: more fault tolerant name_create In case of invalid format such as 'name email@server' (missing chevrons), the parsing would be failing due to a strict behaviour of getaddresses (returns nameemail@server). With the patch this format is accepted. opw 607312 --- openerp/addons/base/res/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index d43028d68ef..30d79bd7da1 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -559,7 +559,7 @@ class res_partner(osv.osv, format_address): """ Supported syntax: - 'Raoul ': 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() From f825b6043bd138049ee2a107e44596ceba8ef954 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 1 Jul 2014 11:29:22 +0200 Subject: [PATCH 3/4] [FIX] rml: avoid reports ending by zero (opw 608073) Commit b6a7402 (reverted at f8671cb) was almost correct, the PageReset should be added at the end of each stories but only if we have one more stories. The PageReset will force the page count to be reseted at zero which means that last page of report would have been at zero. --- openerp/report/render/rml2pdf/trml2pdf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 70965d2c0cd..9ed1a14a21b 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -999,10 +999,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): From 3d3134108d51462474a9323903fe5b549aac0119 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 1 Jul 2014 12:22:28 +0200 Subject: [PATCH 4/4] [FIX] web_linkedin: update master img CDN domain, recently changed --- addons/web_linkedin/web_linkedin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py index 62883840f2d..5a27993bfbd 100644 --- a/addons/web_linkedin/web_linkedin.py +++ b/addons/web_linkedin/web_linkedin.py @@ -36,7 +36,7 @@ class Binary(openerp.addons.web.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())