summaryrefslogtreecommitdiff
path: root/addons/web_calendar/static/src/js
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2016-03-30 11:23:18 +0200
committerDenis Ledoux <dle@odoo.com>2016-03-30 11:23:18 +0200
commit69fa2d5662b7e4e4bd99cfa154297e5c81a45777 (patch)
tree140c2621a2afd4dd3f2df7ba9c9d64e3ffc5814d /addons/web_calendar/static/src/js
parentb21382bdd149f61dd759c4876cbba7d56a3e1f7b (diff)
parent8f1782bd05097755ee2e9e6f150d09cea9f81479 (diff)
[MERGE] forward port of branch saas-6 up to 8f1782b
Diffstat (limited to 'addons/web_calendar/static/src/js')
-rw-r--r--addons/web_calendar/static/src/js/web_calendar.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 9716dfdc013..62b1392cce9 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -36,6 +36,9 @@ function get_fc_defaultOptions() {
dayNames: moment.weekdays(),
dayNamesShort: moment.weekdaysShort(),
firstDay: moment._locale._week.dow,
+ weekNumberCalculation: function(date) {
+ return moment(date).week();
+ },
weekNumbers: true,
titleFormat: {
month: 'MMMM yyyy',