[MERGE] forward port branch saas-11 up to ab0e083ecb

addons/purchase/models/purchase.py

@@ -419,7 +419,7 @@ class PurchaseOrder(models.Model):
                 moves = order.order_line._create_stock_moves(picking)
                 moves = moves.filtered(lambda x: x.state not in ('done', 'cancel')).action_confirm()
                 seq = 0
-                for move in moves:
+                for move in sorted(moves, key=lambda move: move.date_expected):
                     seq += 5
                     move.sequence = seq
                 moves.force_assign()

addons/website_slides/data/website_slides_demo.xml

@@ -28,66 +28,107 @@
         <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">Odoo Website &amp; E-commerce Demonstration</field>
             <field name="url">https://www.youtube.com/watch?v=tR0xandHlhU</field>
+            <field name="document_id">tR0xandHlhU</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/tR0xandHlhU.jpg"/>
+            <field name="description">Create a beautiful and professional eCommerce on your website with Odoo.
+
+Find out more at https://www.odoo.com/page/e-commerce</field>
         </record>
         <record id="slide_2" model="slide.slide">
             <field name="name">Odoo All-in-One Software Demonstration</field>
             <field name="url">https://www.youtube.com/watch?v=tUx39vAENy0</field>
+            <field name="document_id">tUx39vAENy0</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('tag1')), (4, ref('tag2'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/tUx39vAENy0.jpg"/>
+            <field name="description">Discover the all-in-one business management software solution that fits any business size and use case.
+
+Learn more at https://odoo.com</field>
         </record>
         <record id="slide_3" model="slide.slide">
             <field name="name">Odoo Sign Demonstration</field>
             <field name="url">https://www.youtube.com/watch?v=8DBabYQ1nUE</field>
+            <field name="document_id">8DBabYQ1nUE</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('tag2'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/8DBabYQ1nUE.jpg"/>
+            <field name="description">Stop doing manual printing and scanning. Move to electronic signature with Odoo Sign!
+
+Discover more at https://www.odoo.com/page/sign</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('tag2'))]"/>
+            <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

@@ -387,7 +387,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)
@@ -401,7 +401,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)