Merge lp:~openerp-dev/openerp-web/trunk-salesteam-kanban-tpa into lp:openerp-web

[Harry (OpenERP)]

[FIX] web_kanban_gauge: check the value entered in the forecast

[IMP] web_kanban_sparkline: added an option to add a suffix in the sparkline tooltips

[lp:~openerp-dev/openerp-web/trunk-salesteam-kanban-tpa]

3815. By Turkesh Patel (openERP) on 2013-09-04

[MRG] merge with lp:openerp-web

3816. By Turkesh Patel (openERP) on 2013-09-16

[MRG] merge with lp:openerp-wb

3817. By Turkesh Patel (openERP) on 2013-09-16

[IMP] improved code to pass tooltip delay in option and added function so we can set requred help in inherited modules.

3818. By Turkesh Patel (openERP) on 2013-10-11

[MRG] merge with lp:openerp-web

3819. By Turkesh Patel (openERP) on 2013-10-11

[IMP] improved code to set suffix in tooltip.

3820. By Turkesh Patel (openERP) on 2013-10-15

[MRG] merge with lp:openerp-web

3821. By Turkesh Patel (openERP) on 2013-10-15

[MRG] merge with lp:openerp-web

3822. By Turkesh Patel (openERP) on 2013-10-23

[MRG] merge with lp:openerp-web

3823. By Turkesh Patel (openERP) on 2013-10-23

[FIX] replace integer with float in validation

3824. By Turkesh Patel (openERP) on 2013-10-28

[MRG] merge with lp:openerp-web

3825. By Turkesh Patel (openERP) on 2013-10-30

[MRG] merge with lp:openerp-web

3826. By Turkesh Patel (openERP) on 2013-11-15

[MRG] merge with lp:openerp-web

3827. By Turkesh Patel (openERP) on 2013-11-26

[MRG] merge with lp:openerp-web

3828. By Thibault Delavallée (OpenERP) on 2013-12-05

[MERGE] Sync with trunk, notably for bootstrap that landed in trunk

3829. By Thibault Delavallée (OpenERP) on 2013-12-05

[CLEAN] web_kanban_gauge: removed unnecessary code before merging

3830. By Thibault Delavallée (OpenERP) on 2013-12-05

[CLEAN] web_kanban_sparkline: removed tootip_suffix_field, not used and not necessary

=== modified file 'addons/web_kanban/static/src/js/kanban.js'
--- addons/web_kanban/static/src/js/kanban.js	2013-12-02 13:54:14 +0000
+++ addons/web_kanban/static/src/js/kanban.js	2013-12-05 15:14:10 +0000
@@ -440,7 +440,7 @@
                 new_group.do_save_sequences();
             }).fail(function(error, evt) {
                 evt.preventDefault();
-                alert(_t("An error has occured while moving the record to this group: ") + data.message);
+                alert(_t("An error has occured while moving the record to this group: ") + error.data.message);
                 self.do_reload(); // TODO: use draggable + sortable in order to cancel the dragging when the rcp fails
             });
         }

=== modified file 'addons/web_kanban_gauge/static/src/js/kanban_gauge.js'
--- addons/web_kanban_gauge/static/src/js/kanban_gauge.js	2013-09-06 10:05:28 +0000
+++ addons/web_kanban_gauge/static/src/js/kanban_gauge.js	2013-12-05 15:14:10 +0000
@@ -4,7 +4,8 @@
  * Kanban widgets: GaugeWidget
  *
  */
-
+var _t = instance.web._t,
+   _lt = instance.web._lt;
 instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
     className: "oe_gauge",
     start: function() {
@@ -77,13 +78,18 @@
                     $input.focus()
                         .keydown(function (event) {
                             event.stopPropagation();
-                            if (event.keyCode == 13 || event.keyCode == 9) {
-                                if ($input.val() != value) {
-                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
-                                        parent.do_reload();
-                                    });
-                                } else {
-                                    $div.remove();
+                            if(isNaN($input.val())){
+                                self.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid."));
+                                $div.remove();
+                            } else {
+                                if (event.keyCode == 13 || event.keyCode == 9) {
+                                    if ($input.val() != value) {
+                                        parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
+                                            parent.do_reload();
+                                        });
+                                    } else {
+                                        $div.remove();
+                                    }
                                 }
                             }
                         })

=== modified file 'addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js'
--- addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js	2013-10-03 07:58:36 +0000
+++ addons/web_kanban_sparkline/static/src/js/kanban_sparkline.js	2013-12-05 15:14:10 +0000
@@ -13,6 +13,7 @@
         setTimeout(function () {
             var value = _.pluck(self.field.value, 'value');
             var tooltips = _.pluck(self.field.value, 'tooltip');
+            var suffix = self.options.tooltip_suffix || "";
             var sparkline_options = _.extend({
                     type: 'bar',
                     barWidth: 5,
@@ -20,14 +21,14 @@
                     barWidth: 4,
                     barSpacing: 1,
                     barColor: '#96d854',
+                    tooltipFormat: '{{offset:offset}} {{value}} ' + suffix,
                     chartRangeMin: 0,
-                    tooltipFormat: '{{offset:offset}} {{value}}',
                     tooltipValueLookups: {
                         'offset': tooltips
                     }
                 }, self.options);
             self.$el.sparkline(value, sparkline_options);
-            self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
+            self.$el.tipsy({'delayIn': self.options.delayIn || 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
         }, 0);
     },
 });