[FIX] base, report: fix some issues due to removed 'report' module.

fix related to task: https://www.odoo.com/web#id=31625&view_type=form&model=project.task&action=333&active_id=967&menu_id=4720

The 'report' module no longer exists but a dependency was still there in l10n_ca.

- fix dependency in l10n_ca
- fix broken company layout
- move layout templates from base to web
This commit is contained in:
Laurent Smet
2017-05-16 15:37:15 +02:00
parent 0a523a16cd
commit d5fa3232fe
7 changed files with 38 additions and 38 deletions
+1 -1
View File
@@ -94,7 +94,7 @@ class BaseConfigSettings(models.TransientModel):
'res_id': template_id.id,
}
@api.model
@api.multi
def edit_external_header(self):
return self._prepare_report_view_action('web.external_layout_' + self.external_report_layout)
+1 -1
View File
@@ -43,7 +43,7 @@
<div class="mt16">
<button name="change_report_template" string="Change Document Template" type="object" class="oe_link" icon="fa-arrow-right"/>
<button name="edit_external_header" string="Edit Header" type="object" class="oe_link" groups="base.group_no_one"/>
<button name="%(base.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one"/>
<button name="%(web.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one"/>
</div>
</div>
</div>
-1
View File
@@ -38,7 +38,6 @@ position.
'base_iban',
'base_vat',
'l10n_multilang',
'report',
],
'data': [
'data/account_chart_template_data.xml',
+1 -1
View File
@@ -1592,7 +1592,7 @@ class ReportController(http.Controller):
try:
barcode = request.env['ir.actions.report'].barcode(type, value, width=width, height=height, humanreadable=humanreadable)
except (ValueError, AttributeError):
raise exceptions.HTTPException(description='Cannot convert into barcode.')
raise werkzeug.exceptions.HTTPException(description='Cannot convert into barcode.')
return request.make_response(barcode, headers=[('Content-Type', 'image/png')])
+34
View File
@@ -298,6 +298,8 @@
<t t-if="not o and doc">
<t t-set="o" t-value="doc"/>
</t>
<h2 t-esc="o"/>
<t t-if="o and 'company_id' in o">
<t t-set="company" t-value="o.company_id.sudo()"/>
</t>
@@ -358,4 +360,36 @@
</t>
</template>
<!-- Customize the company form view by adding paperformat field as well as demo reports -->
<!-- Demo reports definition -->
<template id="preview_internalreport">
<t t-call="web.html_container">
<t t-call="web.internal_layout">
<div class="page">
<p>This is a sample of an internal report.</p>
</div>
</t>
</t>
</template>
<template id="preview_externalreport">
<t t-call="web.html_container">
<t t-call="web.external_layout">
<div class="page">
<p>This is a sample of an external report.</p>
</div>
</t>
</t>
</template>
<report id="action_report_internalpreview"
model="res.company"
name="web.preview_internalreport"
file="web.preview_internalreport"
string="Preview Internal Report"
report_type="qweb-pdf"/>
<report id="action_report_externalpreview"
model="res.company"
name="web.preview_externalreport"
file="web.preview_externalreport"
string="Preview External Report"
report_type="qweb-pdf"/>
</odoo>
@@ -69,38 +69,5 @@
sequence="3"
groups="base.group_no_one"
/>
<!-- Customize the company form view by adding paperformat field as well as demo reports -->
<!-- Demo reports definition -->
<template id="preview_internalreport">
<t t-call="web.html_container">
<t t-call="web.internal_layout">
<div class="page">
<p>This is a sample of an internal report.</p>
</div>
</t>
</t>
</template>
<template id="preview_externalreport">
<t t-call="web.html_container">
<t t-call="web.external_layout">
<div class="page">
<p>This is a sample of an external report.</p>
</div>
</t>
</t>
</template>
<report id="action_report_internalpreview"
model="res.company"
name="base.preview_internalreport"
file="base.preview_internalreport"
string="Preview Internal Report"
report_type="qweb-pdf"/>
<report id="action_report_externalpreview"
model="res.company"
name="base.preview_externalreport"
file="base.preview_externalreport"
string="Preview External Report"
report_type="qweb-pdf"/>
</data>
</odoo>
+1 -1
View File
@@ -152,7 +152,7 @@
<button type="object" name="set_report_template" context="{'report_template': 'clean'}">
<img src="/base/static/img/preview_clean.png" class="img img-responsive img-thumbnail" alt="Preview Clean Template"/>
</button>
<a href="/base/static/src/pdf/preview_clean.pdf" target="_blank">preview</a>
<a href="/base/static/pdf/preview_clean.pdf" target="_blank">preview</a>
</div><div class="col-xs-3 text-center">
<button type="object" name="set_report_template" context="{'report_template': 'standard'}">
<img src="/base/static/img/preview_standard.png" class="img img-responsive img-thumbnail" alt="Preview Minimalist Template"/>