[MERGE] forward port branch 9.0 up to 2c5fe07fc76

7 files changed, 19 insertions, 7 deletions

diff --git a/addons/product/models/product_pricelist.py b/addons/product/models/product_pricelist.py
index d44c2ba0ebc..b7652b5a226 100644
--- a/addons/product/models/product_pricelist.py
+++ b/addons/product/models/product_pricelist.py
@@ -346,7 +346,7 @@ class PricelistItem(models.Model):
         'product.category', 'Product Category', ondelete='cascade',
         help="Specify a product category if this rule only applies to products belonging to this category or its children categories. Keep empty otherwise.")
     min_quantity = fields.Integer(
-        'Min. Quantity', default=1,
+        'Min. Quantity', default=0,
         help="For the rule to apply, bought/sold quantity must be greater "
              "than or equal to the minimum quantity specified in this field.\n"
              "Expressed in the default unit of measure of the product.")
diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py
index 9421ae137ef..88faeee4001 100644
--- a/addons/purchase/models/purchase.py
+++ b/addons/purchase/models/purchase.py
@@ -1174,5 +1174,6 @@ class MailComposeMessage(models.TransientModel):
     @api.multi
     def send_mail(self, auto_commit=False):
         if self._context.get('default_model') == 'purchase.order' and self._context.get('default_res_id'):
+            self = self.with_context(mail_post_autofollow=True)
             self.mail_purchase_order_on_send()
-        return super(MailComposeMessage, self.with_context(mail_post_autofollow=True)).send_mail(auto_commit=auto_commit)
+        return super(MailComposeMessage, self).send_mail(auto_commit=auto_commit)
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 357e939525e..13412fd37a5 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -46,7 +46,7 @@
             <field name="name">Public access to user_input</field>
             <field name="model_id" ref="survey.model_survey_user_input"/>
             <field name="domain_force">[('create_uid', '=', user.id)]</field>
-            <field name="groups" eval="[(4, ref('base.group_public'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_user')), (4, ref('base.group_portal')), (4, ref('base.group_public'))]"/>
             <field eval="0" name="perm_unlink"/>
             <field eval="0" name="perm_write"/>
             <field eval="1" name="perm_read"/>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 25f05287c88..427a629dd90 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -103,8 +103,8 @@
                 and main_object.website_meta_description or website_meta_description"/>
             <t t-set="meta_keywords" t-value="main_object and 'website_meta_keywords' in main_object
                 and main_object.website_meta_keywords or website_meta_keywords"/>
-            <meta t-if="meta_description" name="description" t-att-content="meta_description"/>
-            <meta t-if="meta_keywords" name="keywords" t-att-content="meta_keywords"/>
+            <meta t-if="meta_description or editable" name="description" t-att-content="meta_description"/>
+            <meta t-if="meta_keywords or editable" name="keywords" t-att-content="meta_keywords"/>
 
             <!-- OpenGraph tags for Facebook sharing -->
             <meta property="og:title" t-att-content="additional_title" />
diff --git a/addons/website_portal/views/website_portal_templates.xml b/addons/website_portal/views/website_portal_templates.xml
index 0962b3bbb5d..98e875f93ad 100644
--- a/addons/website_portal/views/website_portal_templates.xml
+++ b/addons/website_portal/views/website_portal_templates.xml
@@ -160,7 +160,7 @@
                                         <select name="country_id" class="form-control">
                                             <option value="">Country...</option>
                                             <t t-foreach="countries or []" t-as="country">
-                                                <option t-att-value="country.id" t-att-selected="country.id == partner.country_id.id">
+                                                <option t-att-value="country.id" t-att-selected="country.id == int(country_id) if country_id else country.id == partner.country_id.id">
                                                     <t t-esc="country.name" />
                                                 </option>
                                             </t>
diff --git a/doc/cla/individual/bigbear3001.md b/doc/cla/individual/bigbear3001.md
new file mode 100644
index 00000000000..9690403db37
--- /dev/null
+++ b/doc/cla/individual/bigbear3001.md
@@ -0,0 +1,11 @@
+Austria, 18th of March 2018
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Andreas Perhab bigbear.ap@gmx.at https://github.com/bigbear3001
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index aae7d03b8ba..cc78652f15e 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -481,7 +481,7 @@ Source installation requires manually installing dependencies:
 
         $ sudo npm install -g less
 
-  - on Windows, `install nodejs <http://nodejs.org/download/>`_, reboot (to
+  - on Windows, `install nodejs <https://nodejs.org/en/download/>`_, reboot (to
     update the :envvar:`PATH`) and install less:
 
     .. code-block:: ps1