diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 814b0e9b7ff..2b3ee74323b 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -396,7 +396,7 @@ class PurchaseOrder(models.Model): moves = order.order_line.filtered(lambda r: r.product_id.type in ['product', 'consu'])._create_stock_moves(picking) moves = moves.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() diff --git a/addons/website_slides/data/demo-thumbnails/8DBabYQ1nUE.jpg b/addons/website_slides/data/demo-thumbnails/8DBabYQ1nUE.jpg new file mode 100644 index 00000000000..2a4245bf9ba Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/8DBabYQ1nUE.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg b/addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg new file mode 100644 index 00000000000..9f26fb0a4bd Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg b/addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg new file mode 100644 index 00000000000..5708a30e98f Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg b/addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg new file mode 100644 index 00000000000..459d2a38ffc Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg b/addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg new file mode 100644 index 00000000000..0f51f626fdc Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/tR0xandHlhU.jpg b/addons/website_slides/data/demo-thumbnails/tR0xandHlhU.jpg new file mode 100644 index 00000000000..e9d595e1fb1 Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/tR0xandHlhU.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/tUx39vAENy0.jpg b/addons/website_slides/data/demo-thumbnails/tUx39vAENy0.jpg new file mode 100644 index 00000000000..223b7a47e0b Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/tUx39vAENy0.jpg differ diff --git a/addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg b/addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg new file mode 100644 index 00000000000..4cf84bcdd0c Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg differ diff --git a/addons/website_slides/data/website_slides_demo.xml b/addons/website_slides/data/website_slides_demo.xml index c378c1e0f51..87921f5514e 100644 --- a/addons/website_slides/data/website_slides_demo.xml +++ b/addons/website_slides/data/website_slides_demo.xml @@ -28,66 +28,107 @@ Odoo Explained http://www.youtube.com/watch?v=o0UM3Lg7K4Y + o0UM3Lg7K4Y + video + + Run your business with a comprehensive suite of business apps. Do it easily with Odoo! Odoo Website & E-commerce Demonstration https://www.youtube.com/watch?v=tR0xandHlhU + tR0xandHlhU + video + + Create a beautiful and professional eCommerce on your website with Odoo. + +Find out more at https://www.odoo.com/page/e-commerce Odoo All-in-One Software Demonstration https://www.youtube.com/watch?v=tUx39vAENy0 + tUx39vAENy0 + video + + Discover the all-in-one business management software solution that fits any business size and use case. + +Learn more at https://odoo.com Odoo Sign Demonstration https://www.youtube.com/watch?v=8DBabYQ1nUE + 8DBabYQ1nUE + video + + Stop doing manual printing and scanning. Move to electronic signature with Odoo Sign! + +Discover more at https://www.odoo.com/page/sign Awesome Timesheet by Odoo https://www.youtube.com/watch?v=v2O0YZU19ms + v2O0YZU19ms + video + + 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 Odoo Marketing - part 1: ATTRACT https://www.youtube.com/watch?v=qhSCMShJkTY&list=UUkQPikELWZFLgQNHd73jkdg + qhSCMShJkTY + video + + 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 Odoo Marketing - part 1: ATTRACT_2 https://www.youtube.com/watch?v=L1Ye6ATzZXY&list=UUkQPikELWZFLgQNHd73jkdg + L1Ye6ATzZXY + video + + 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 Odoo Marketing - part 1: ATTRACT_3 https://www.youtube.com/watch?v=sEvZyNZCtOs&list=UUkQPikELWZFLgQNHd73jkdg + sEvZyNZCtOs + video + + 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 diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index 913664dbf1d..6dff4535f7a 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -373,7 +373,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) @@ -387,7 +387,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)