pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-11 up to 285a9d0406

Browse Source
This commit is contained in:
Christophe Simonis
2017-07-31 11:17:16 +02:00
parent b244f31151 285a9d0406
commit 1e64a88cd3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/models/res_partner.py
+1
View File
@@ -30,5 +30,6 @@ class ResPartner(models.Model):
if partner_id: # Modifying existing partner if partner_id: # Modifying existing partner
self.browse(partner_id).write(partner) self.browse(partner_id).write(partner)
else: else:
partner['lang'] = self.env.user.lang
partner_id = self.create(partner).id partner_id = self.create(partner).id
return partner_id return partner_id
addons/website_slides/models/slides.py
+4 -1
View File
@@ -371,7 +371,10 @@ class Slide(models.Model):
if slide.id: # avoid to perform a slug on a not yet saved record in case of an onchange. if slide.id: # avoid to perform a slug on a not yet saved record in case of an onchange.
# link_tracker is not in dependencies, so use it to shorten url only if installed. # link_tracker is not in dependencies, so use it to shorten url only if installed.
if self.env.registry.get('link.tracker'): if self.env.registry.get('link.tracker'):
url = self.env['link.tracker'].sudo().create({'url': '%s/slides/slide/%s' % (base_url, slug(slide))}).short_url url = self.env['link.tracker'].sudo().create({
'url': '%s/slides/slide/%s' % (base_url, slug(slide)),
'title': slide.name,
}).short_url
else: else:
url = '%s/slides/slide/%s' % (base_url, slug(slide)) url = '%s/slides/slide/%s' % (base_url, slug(slide))
slide.website_url = url slide.website_url = url