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

[MERGE] forward port branch saas-6 up to b3ddbbd4ba

Browse Source
This commit is contained in:
Christophe Simonis
2017-08-01 16:05:13 +02:00
parent 6fe846ec2f b3ddbbd4ba
commit 587668797e
11 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_slides/data/demo-thumbnails/5DPGnN9_uKU.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

addons/website_slides/data/demo-thumbnails/5PKqZpl0TcA.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

addons/website_slides/data/demo-thumbnails/ILTPZUTWKhg.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

addons/website_slides/data/demo-thumbnails/pp7OCqWoRjQ.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

addons/website_slides/data/website_slides_demo.xml
+42
View File
@@ -36,74 +36,116 @@
<record id="slide_0" model="slide.slide">
<field name="name">Odoo Explained</field>
<field name="url">http://www.youtube.com/watch?v=o0UM3Lg7K4Y</field>
<field name="document_id">o0UM3Lg7K4Y</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag2'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg"/>
<field name="description">Run your business with a comprehensive suite of business apps. Do it easily with Odoo!</field>
</record>
<record id="slide_1" model="slide.slide">
<field name="name">Open Source Website Builder and eCommerce: Odoo</field>
<field name="url">https://www.youtube.com/watch?v=pp7OCqWoRjQ</field>
<field name="document_id">pp7OCqWoRjQ</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag1'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/pp7OCqWoRjQ.jpg"/>
<field name="description">Create enterprise grade website with our super easy builder. Use finely designed building blocks and edit everything inline. Benefit from out-of-the-box business features; e-Commerce, events, blogs, jobs announces, customer references, call-to-actions, etc.
This is a new open source application in Python/Javascript based on Bootstrap and OpenERP.</field>
</record>
<record id="slide_2" model="slide.slide">
<field name="name">Odoo Open Days 2014</field>
<field name="url">https://www.youtube.com/watch?v=ILTPZUTWKhg&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
<field name="document_id">ILTPZUTWKhg</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_2"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag3'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/ILTPZUTWKhg.jpg"/>
<field name="description">Odoo Experience - Register now https://experience.odoo.com</field>
</record>
<record id="slide_3" model="slide.slide">
<field name="name">Odoo - The Voice of the Customer: Alpinter</field>
<field name="url">https://www.youtube.com/watch?v=5DPGnN9_uKU&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
<field name="document_id">5DPGnN9_uKU</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_2"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag4'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/5DPGnN9_uKU.jpg"/>
<field name="description">Interview with Guy Christiaens, Finance Manager at Alpinter, about their use of Odoo.
Discover more about Odoo at www.odoo.com</field>
</record>
<record id="slide_4" model="slide.slide">
<field name="name">Odoo SEO - Boost Your Website Trafic</field>
<field name="url">https://www.youtube.com/watch?v=5PKqZpl0TcA</field>
<field name="document_id">5PKqZpl0TcA</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag1'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/5PKqZpl0TcA.jpg"/>
<field name="description">The open source OpenERP Promote tool suggests keywords according to Google most searched terms. Search Engine Optimization tools are ready to use, with no configuration required.</field>
</record>
<record id="slide_5" model="slide.slide">
<field name="name">Awesome Timesheet by Odoo</field>
<field name="url">https://www.youtube.com/watch?v=v2O0YZU19ms</field>
<field name="document_id">v2O0YZU19ms</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag3'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg"/>
<field name="description">Download Awesome Timesheet by Odoo and discover how easy time tracking and employee management can be!
Chrome: http://bit.ly/2613LcY
iOS: http://bit.ly/1ZUZsZD</field>
</record>
<record id="slide_6" model="slide.slide">
<field name="name">Odoo Marketing - part 1: ATTRACT</field>
<field name="url">https://www.youtube.com/watch?v=qhSCMShJkTY&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
<field name="document_id">qhSCMShJkTY</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag1')), (4, ref('tag2'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg"/>
<field name="description">Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com</field>
</record>
<record id="slide_7" model="slide.slide">
<field name="name">Odoo Marketing - part 1: ATTRACT_2</field>
<field name="url">https://www.youtube.com/watch?v=L1Ye6ATzZXY&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
<field name="document_id">L1Ye6ATzZXY</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag1')), (4, ref('tag2'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg"/>
<field name="description">Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com</field>
</record>
<record id="slide_8" model="slide.slide">
<field name="name">Odoo Marketing - part 1: ATTRACT_3</field>
<field name="url">https://www.youtube.com/watch?v=sEvZyNZCtOs&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
<field name="document_id">sEvZyNZCtOs</field>
<field name="slide_type">video</field>
<field name="channel_id" ref="channel_public"/>
<field name="category_id" ref="category_1"/>
<field name="website_published" eval="True"/>
<field name="tag_ids" eval="[(4, ref('tag1')), (4, ref('tag2'))]"/>
<field name="image" type="base64" file="website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg"/>
<field name="description">Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com</field>
</record>
<record id="slide_9" model="slide.slide">
addons/website_slides/models/slides.py
+2 -2
View File
@@ -362,7 +362,7 @@ class Slide(models.Model):
values['image'] = values['datas']
if values.get('website_published') and not values.get('date_published'):
values['date_published'] = datetime.datetime.now()
if values.get('url'):
if values.get('url') and not values.get('document_id'):
doc_data = self._parse_document_url(values['url']).get('values', dict())
for key, value in doc_data.iteritems():
values.setdefault(key, value)
@@ -376,7 +376,7 @@ class Slide(models.Model):
@api.multi
def write(self, values):
if values.get('url'):
if values.get('url') and values['url'] != self.url:
doc_data = self._parse_document_url(values['url']).get('values', dict())
for key, value in doc_data.iteritems():
values.setdefault(key, value)