[MERGE] forward port branch 9.0 up to 7bd8f9a5b2

addons/point_of_sale/static/src/js/models.js

@@ -1484,7 +1484,7 @@ exports.Orderline = Backbone.Model.extend({
         var sign = 1;
         if(base < 0){
             base = -base;
-            var sign = -1;
+            sign = -1;
         }
 
         var incl_fixed_amount = 0.0;
@@ -1531,8 +1531,8 @@ exports.Orderline = Backbone.Model.extend({
         });
         return {
             taxes: taxes_vals,
-            total_excluded: round_pr(total_excluded, currency_rounding_bak),
+            total_excluded: sign * round_pr(total_excluded, currency_rounding_bak),
-            total_included: round_pr(total_included, currency_rounding_bak)
+            total_included: sign * round_pr(total_included, currency_rounding_bak)
         };
     },
     get_all_prices: function(){

addons/web_editor/static/src/js/summernote.js

@@ -550,6 +550,13 @@ dom.removeBetween = function (sc, so, ec, eo, towrite) {
         so = 0;
         eo = 1;
     }
+
+    var parentNode = sc && sc.parentNode;
+    if (parentNode && sc.tagName === 'BR') {
+        sc = parentNode;
+        ec = parentNode;
+    }
+
     return {
         sc: sc,
         so: so,
@@ -1169,9 +1176,9 @@ $.summernote.pluginEvents.visible = function (event, editor, layoutInfo) {
     if (!r) return;
 
     if (!r.isCollapsed()) {
-        if (dom.isCell(dom.node(r.sc)) || dom.isCell(dom.node(r.ec))) {
+        if ((dom.isCell(dom.node(r.sc)) || dom.isCell(dom.node(r.ec))) && dom.node(r.sc) !== dom.node(r.ec)) {
             remove_table_content(r);
-            r = range.create(r.ec, 0).select();
+            r = range.create(r.ec, 0);
         }
         r.select();
     }