[MERGE] forward port of branch saas-6 up to 8f1782b

addons/calendar/calendar.py

@@ -1682,7 +1682,7 @@ class calendar_event(osv.Model):
             if r['class'] == 'private':
                 for f in r.keys():
                     recurrent_fields = self._get_recurrent_fields(cr, uid, context=context)
-                    public_fields = list(set(recurrent_fields + ['id', 'allday', 'start', 'stop', 'duration', 'user_id', 'state', 'interval', 'count', 'recurrent_id_date', 'rrule']))
+                    public_fields = list(set(recurrent_fields + ['id', 'allday', 'start', 'stop', 'display_start', 'display_stop', 'duration', 'user_id', 'state', 'interval', 'count', 'recurrent_id_date', 'rrule']))
                     if f not in public_fields:
                         if isinstance(r[f], list):
                             r[f] = []

addons/web/static/src/js/views/list_view.js

@@ -1156,7 +1156,7 @@ ListView.List = Class.extend( /** @lends instance.web.ListView.List# */{
                     record.set(column.id, names[0]);
                 });
             }
-        } else if (column.type === 'many2many') {
+        } else if (column.type === 'many2many' || column.type === 'one2many') {
             value = record.get(column.id);
             // non-resolved (string) m2m values are arrays
             if (value instanceof Array && !_.isEmpty(value)

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',

addons/website/controllers/main.py

@@ -379,6 +379,7 @@ class Website(openerp.addons.web.controllers.main.Home):
 #------------------------------------------------------
 class WebsiteBinary(openerp.http.Controller):
     @http.route([
+        '/website/image',
         '/website/image/<xmlid>',
         '/website/image/<xmlid>/<int:width>x<int:height>',
         '/website/image/<xmlid>/<field>',

addons/website_sale/controllers/main.py

@@ -810,7 +810,7 @@ class website_sale(http.Controller):
                 tx = False
                 tx_id = False
             elif tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
-                tx.write(dict(transaction_obj.on_change_partner_id(cr, uid, None, order.partner_id.id, context=context).get('value', {}), amount=order.amount_total))
+                tx.write(dict(transaction_obj.on_change_partner_id(cr, SUPERUSER_ID, None, order.partner_id.id, context=context).get('value', {}), amount=order.amount_total))
         if not tx:
             tx_id = transaction_obj.create(cr, SUPERUSER_ID, {
                 'acquirer_id': acquirer_id,