[MERGE] forward port branch saas-6 up to a56d265

addons/report_intrastat/report_intrastat_view.xml

@@ -75,7 +75,7 @@
             <field name="name">report.intrastat.view</field>
             <field name="model">report.intrastat</field>
             <field name="arch" type="xml">
-                <tree string="Intrastat Data" create="false">
+                <tree string="Intrastat Data" create="false" delete="false">
                     <field name="name" />
                     <field name="month"/>
                     <field name="code"/>

openerp/http.py

@@ -804,7 +804,7 @@ class HttpRequest(WebRequest):
         if request.httprequest.method == 'OPTIONS' and request.endpoint and request.endpoint.routing.get('cors'):
             headers = {
                 'Access-Control-Max-Age': 60 * 60 * 24,
-                'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept'
+                'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept, X-Debug-Mode'
             }
             return Response(status=200, headers=headers)