diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 6515b82eac0..1c35f91a295 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -282,7 +282,7 @@ class AccountMoveLine(models.Model):
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_partner_id_ref_idx ON account_move_line (partner_id, ref)')
 
-    @api.depends('debit', 'credit', 'amount_currency', 'currency_id', 'matched_debit_ids', 'matched_credit_ids', 'matched_debit_ids.amount', 'matched_credit_ids.amount', 'account_id.currency_id', 'move_id.state')
+    @api.depends('debit', 'credit', 'amount_currency', 'currency_id', 'matched_debit_ids', 'matched_credit_ids', 'matched_debit_ids.amount', 'matched_credit_ids.amount', 'move_id.state')
     def _amount_residual(self):
         """ Computes the residual amount of a move line from a reconciliable account in the company currency and the line's currency.
             This amount will be 0 for fully reconciled lines or lines from a non-reconciliable account, the original line amount
diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py
index a59f0050e6d..d818a6c5721 100644
--- a/addons/stock/models/procurement.py
+++ b/addons/stock/models/procurement.py
@@ -244,7 +244,7 @@ class ProcurementOrder(models.Model):
             self.sudo()._procure_orderpoint_confirm(use_new_cursor=use_new_cursor, company_id=company_id)
 
             # Search all confirmed stock_moves and try to assign them
-            confirmed_moves = self.env['stock.move'].search([('state', '=', 'confirmed')], limit=None, order='priority desc, date_expected asc')
+            confirmed_moves = self.env['stock.move'].search([('state', '=', 'confirmed'), ('product_uom_qty', '!=', 0.0)], limit=None, order='priority desc, date_expected asc')
             for x in xrange(0, len(confirmed_moves.ids), 100):
                 # TDE CLEANME: muf muf
                 self.env['stock.move'].browse(confirmed_moves.ids[x:x + 100]).action_assign()
diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js
index 06b8b2005f0..005d085fec8 100644
--- a/addons/web_editor/static/src/js/widgets.js
+++ b/addons/web_editor/static/src/js/widgets.js
@@ -1128,6 +1128,7 @@ var LinkDialog = Dialog.extend({
                 this.$('input.email-address').val(match = /mailto:(.+)/.exec(href) ? match[1] : '');
             } else {
                 this.$('input.url').val(href);
+                this.$('input.window-new').closest("div").show();
             }
         }
         this.preview();
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 28096ee4223..efcddf279be 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1610,12 +1610,6 @@
         </t>
         <t t-if="tx_ids and state == 'pending' and validation">
             <p>Your transaction is waiting a manual confirmation.</p>
-            <br />
-            <t t-if="tx_post_msg">
-                <div class="hidden-print">
-                    <t t-raw="tx_post_msg" />
-                </div>
-            </t>
         </t>
         <t t-if="tx_ids and state not in ['done', 'cancel', 'pending', 'authorized']">
             <p>Your transaction is waiting confirmation.</p>
diff --git a/doc/cla/corporate/odoogap.md b/doc/cla/corporate/odoogap.md
new file mode 100644
index 00000000000..08a10ddd683
--- /dev/null
+++ b/doc/cla/corporate/odoogap.md
@@ -0,0 +1,18 @@
+PromptEQUATION, 2017-09-03
+
+PromptEquation/ OdooGap agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Diogo Duarte dduarte@odoogap.com https://github.com/dduarte-odoogap
+
+List of contributors:
+
+Diogo Duarte dduarte@odoogap.com https://github.com/dduarte-odoogap
+Diogo Duarte diogocarvalhoduarte@gmail.com https://github.com/dduarte-odoogap
+Carlos Fonseca cfonseca@odoogap.com https://github.com/cfonseca-odoogap
+Carlos Fonseca carlosmigueldafonseca@gmail.com https://github.com/cpintofonseca
diff --git a/doc/cla/individual/hilarak.md b/doc/cla/individual/hilarak.md
new file mode 100644
index 00000000000..4e164fe88d1
--- /dev/null
+++ b/doc/cla/individual/hilarak.md
@@ -0,0 +1,11 @@
+India, 18-02-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,
+
+Hilar AK hilarak@gmail.com https://github.com/hilarak