From 57f320aa99f57fd560e2a5f242dd9f5824e76435 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 14 Nov 2016 15:05:37 +0100
Subject: [PATCH 1/3] [FIX] website_sale: selected state in billing information

The selected state of the user was not displayed in the billing information
due to the detach function.

opw:693127
---
 addons/website_sale/static/src/js/website_sale.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 006a328dbc8..1dac377270e 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -338,8 +338,10 @@ $('.oe_website_sale').each(function () {
     var state_options = $("select[name='state_id'] option:not(:first)");
     $(oe_website_sale).on('change', "select[name='country_id']", function () {
         var select = $("select[name='state_id']");
+        var selected_state = select.val();
         state_options.detach();
         var displayed_state = state_options.filter("[data-country_id="+($(this).val() || 0)+"]");
+        select.val(selected_state);
         var nb = displayed_state.appendTo(select).show().size();
         select.parent().toggle(nb>=1);
     });
@@ -348,8 +350,10 @@ $('.oe_website_sale').each(function () {
     var shipping_state_options = $("select[name='shipping_state_id'] option:not(:first)");
     $(oe_website_sale).on('change', "select[name='shipping_country_id']", function () {
         var select = $("select[name='shipping_state_id']");
+        var selected_state = select.val();
         shipping_state_options.detach();
         var displayed_state = shipping_state_options.filter("[data-country_id="+($(this).val() || 0)+"]");
+        select.val(selected_state);
         var nb = displayed_state.appendTo(select).show().size();
         select.parent().toggle(nb>=1);
     });

From f68a304d1dcd1cfba45fa1aaa05f7f2bb45476d5 Mon Sep 17 00:00:00 2001
From: Florent de Labarre <florent.mirieu@gmail.com>
Date: Sat, 12 Nov 2016 23:31:10 +0100
Subject: [PATCH 2/3] [CLA] Signature fmdl

Closes #14286
---
 doc/cla/individual/fmdl.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/cla/individual/fmdl.md

diff --git a/doc/cla/individual/fmdl.md b/doc/cla/individual/fmdl.md
new file mode 100644
index 00000000000..45c3464ce3f
--- /dev/null
+++ b/doc/cla/individual/fmdl.md
@@ -0,0 +1,11 @@
+France, 12-11-2016
+
+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,
+
+Florent de Labarre florent.mirieu@gmail.com https://github.com/fmdl

From 7be6c7404a09425f50fd7055dfb66f8b7b5dcf7e Mon Sep 17 00:00:00 2001
From: Florent de Labarre <florent@iguanayachts.com>
Date: Sat, 12 Nov 2016 23:12:07 +0100
Subject: [PATCH 3/3] [FIX] stock: expression error

Without this fix, the button of order rules does not appear in the form with a
product.product model.

Closes #14285
---
 addons/stock/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 658e2a2bc3a..68b8b656bd4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -239,7 +239,7 @@
                             <field name="nbr_reordering_rules" widget="statinfo"/>
                         </button>
                         <button name="%(product_open_orderpoint)d" type="action"
-                            attrs="{'invisible':['|',('type', '!=', ['product', 'consu']),('nbr_reordering_rules', '!=', 1)]}"
+                            attrs="{'invisible':['|',('type', 'not in', ['product', 'consu']),('nbr_reordering_rules', '!=', 1)]}"
                             class="oe_stat_button" icon="fa-refresh">
                             <div class="o_form_field o_stat_info mr4">
                                 <span class="o_stat_text">Min :</span>