pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Christophe Simonis
2016-11-08 13:51:21 +01:00
parent 7fca8ad89e a56d2655b4
commit b795755001
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report_intrastat/report_intrastat_view.xml
+1 -1
View File
@@ -75,7 +75,7 @@
<field name="name">report.intrastat.view</field> <field name="name">report.intrastat.view</field>
<field name="model">report.intrastat</field> <field name="model">report.intrastat</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Intrastat Data" create="false"> <tree string="Intrastat Data" create="false" delete="false">
<field name="name" /> <field name="name" />
<field name="month"/> <field name="month"/>
<field name="code"/> <field name="code"/>
openerp/http.py
+1 -1
View File
@@ -804,7 +804,7 @@ class HttpRequest(WebRequest):
if request.httprequest.method == 'OPTIONS' and request.endpoint and request.endpoint.routing.get('cors'): if request.httprequest.method == 'OPTIONS' and request.endpoint and request.endpoint.routing.get('cors'):
headers = { headers = {
'Access-Control-Max-Age': 60 * 60 * 24, '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) return Response(status=200, headers=headers)