diff --git a/addons/base_calendar/static/src/js/base_calendar.js b/addons/base_calendar/static/src/js/base_calendar.js
index 73cb0025d2e..e5924a8fe75 100644
--- a/addons/base_calendar/static/src/js/base_calendar.js
+++ b/addons/base_calendar/static/src/js/base_calendar.js
@@ -145,6 +145,9 @@ openerp.base_calendar = function(instance) {
});
}
+
+
+
};
diff --git a/addons/google_calendar/static/src/js/calendar_sync.js b/addons/google_calendar/static/src/js/calendar_sync.js
index d1f742f5629..ad581604ea4 100644
--- a/addons/google_calendar/static/src/js/calendar_sync.js
+++ b/addons/google_calendar/static/src/js/calendar_sync.js
@@ -1,7 +1,3 @@
-/*---------------------------------------------------------
- * OpenERP web_calendar
- *---------------------------------------------------------*/
-
openerp.google_calendar = function(instance) {
var _t = instance.web._t,
_lt = instance.web._lt;
@@ -46,5 +42,16 @@ openerp.google_calendar = function(instance) {
}).always(function(o) { $('div.oe_cal_sync_button').prop('disabled',false); });
}
});
+
+ instance.web_calendar.FullCalendarView.include({
+ extraSideBar: function() {
+ this._super();
+ if (this.dataset.model == "crm.meeting") {
+ var button = QWeb.render('GoogleCalendar.buttonSynchro');
+ this.$el.find('.oe_calendar_filter').prepend(button);
+ console.log("added");
+ }
+ }
+ });
};
diff --git a/addons/google_calendar/static/src/xml/web_calendar.xml b/addons/google_calendar/static/src/xml/web_calendar.xml
index df09fac6da1..b9a15c17fdc 100644
--- a/addons/google_calendar/static/src/xml/web_calendar.xml
+++ b/addons/google_calendar/static/src/xml/web_calendar.xml
@@ -1,17 +1,14 @@
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/addons/hr_holidays/static/src/js/QuickCreate.js b/addons/hr_holidays/static/src/js/QuickCreate.js
index af91da95633..586aa591a21 100644
--- a/addons/hr_holidays/static/src/js/QuickCreate.js
+++ b/addons/hr_holidays/static/src/js/QuickCreate.js
@@ -65,8 +65,10 @@ openerp.hr_holidays = function(instance) {
var name = this.$el.find(".qc_name").val();
var type = this.$el.find(".qc_type").val();
- if (/^\s*$/.test(name)) { return; }
- this.quick_create({'name': name,'holiday_status_id':parseInt(type)});
+ if (/^\s*$/.test(name)) {
+ return false;
+ }
+ return this.quick_create({'name': name,'holiday_status_id':parseInt(type)}).always(function() { return true; });
},
diff --git a/addons/hr_holidays/static/src/xml/qweb.xml b/addons/hr_holidays/static/src/xml/qweb.xml
index 1af30affb26..2148c5f7e61 100644
--- a/addons/hr_holidays/static/src/xml/qweb.xml
+++ b/addons/hr_holidays/static/src/xml/qweb.xml
@@ -1,9 +1,13 @@
-
-
-
+
+
+
+
+
+
+
+