[MERGE] forward port branch saas-14 up to af8de1a3ed

addons/payment_stripe/static/src/js/stripe.js

@@ -70,9 +70,6 @@ odoo.define('payment_stripe.stripe', function(require) {
             var currency = $("input[name='currency']").val();
             var currency_id = $("input[name='currency_id']").val();
             var amount = parseFloat($("input[name='amount']").val() || '0.0');
-            if (!_.contains(int_currencies, currency)) {
-                amount = amount*100;
-            }
 
             ajax.jsonRpc('/website_payment/transaction', 'call', {
                     reference: $("input[name='invoice_num']").val(),
@@ -84,14 +81,11 @@ odoo.define('payment_stripe.stripe', function(require) {
                     name: $("input[name='merchant']").val(),
                     description: $("input[name='invoice_num']").val(),
                     currency: currency,
-                    amount: amount,
+                    amount: _.contains(int_currencies, currency) ? amount : amount * 100,
                 });
         } else {
             var currency = $("input[name='currency']").val();
             var amount = parseFloat($("input[name='amount']").val() || '0.0');
-            if (!_.contains(int_currencies, currency)) {
-                amount = amount*100;
-            }
 
             ajax.jsonRpc('/shop/payment/transaction/' + acquirer_id, 'call', {
                     so_id: so_id,
@@ -102,7 +96,7 @@ odoo.define('payment_stripe.stripe', function(require) {
                     name: $("input[name='merchant']").val(),
                     description: $("input[name='invoice_num']").val(),
                     currency: currency,
-                    amount: amount,
+                    amount: _.contains(int_currencies, currency) ? amount : amount * 100,
                 });
             });
         }

addons/point_of_sale/static/src/js/screens.js

@@ -1985,6 +1985,7 @@ var PaymentScreenWidget = ScreenWidget.extend({
 
             invoiced.fail(function(error){
                 self.invoicing = false;
+                order.finalized = false;
                 if (error.message === 'Missing Customer') {
                     self.gui.show_popup('confirm',{
                         'title': _t('Please select the Customer'),

addons/purchase_mrp/__manifest__.py

@@ -8,7 +8,7 @@
     'category': 'Hidden',
     'description': """
 This module provides facility to the user to install mrp and purchase modules at a time.
-====================================================================================
+========================================================================================
 
 It is basically used when we want to keep track of production orders generated
 from purchase order.

addons/web_editor/static/src/js/transcoder.js

@@ -9,7 +9,7 @@ var getMatchedCSSRules = function (a) {
         var sheets = document.styleSheets;
         for(var i = sheets.length-1; i >= 0 ; i--) {
             var rules;
-            if (sheets[i].rules) {
+            if (sheets[i].hasOwnProperty('rules')) {
                 rules = sheets[i].rules;
             } else {
                 //try...catch because Firefox not able to enumerate document.styleSheets[].cssRules[] for cross-domain stylesheets.

addons/website/models/ir_qweb.py

@@ -26,7 +26,7 @@ class QWeb(models.AbstractModel):
     def _get_asset(self, xmlid, options, css=True, js=True, debug=False, async=False, values=None):
         website = getattr(request, 'website', None) if request else None
         if website and website.cdn_activated:
-            values = dict(values, url_for=website.get_cdn_url)
+            values = dict(values or {}, url_for=website.get_cdn_url)
         return super(QWeb, self)._get_asset(xmlid, options, css, js, debug, async, values)
 
     def _website_build_attribute(self, tagName, name, value, options, values):

doc/cla/corporate/wt-io-it.md

@@ -0,0 +1,15 @@
+Austria, 2018-02-06
+
+WT-IO-IT GmbH 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,
+
+Wolfgang Taferner wolfgang.taferner@wt-io-it.at https://github.com/wt-io-it
+
+List of contributors:
+
+Wolfgang Taferner wolfgang.taferner@wt-io-it.at https://github.com/wtaferner

doc/cla/individual/remi-filament.md

@@ -8,4 +8,4 @@ declaration.
 
 Signed,
 
-Rémi CAZENAVE remi@le-filament.com https://github.com/remi-filament
+Rémi CAZENAVE 30716308+remi-filament@users.noreply.github.com https://github.com/remi-filament