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

[FIX] account: fix invoice reports

Browse Source 
- This commit fixes invoice reports header and footer:
  The header was half displayed and "Phone Number" was
  displayed on two lines

- This commit also add a link in report preview to go back
  to the backend:
  When account was the only module installed there was no
  link to go back to the backend

task-2032586
This commit is contained in:
mcm-odoo
2019-08-29 11:49:17 +00:00
parent d4710d92dd
commit 4d64e553b8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/views/account_portal_templates.xml
+1 -1
View File
@@ -74,7 +74,7 @@
<template id="portal_invoice_page" name="Invoice Portal Template" inherit_id="portal.portal_sidebar" primary="True">
<xpath expr="//div[hasclass('o_portal_sidebar')]" position="inside">
<t t-set="o_portal_fullwidth_alert" groups="sales_team.group_sale_salesman">
<t t-set="o_portal_fullwidth_alert" groups="sales_team.group_sale_salesman,account.group_account_invoice">
<t t-call="portal.portal_back_in_edit_mode">
<t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;action=%s&amp;view_type=form' % (invoice._name, invoice.id, invoice.env.ref('account.action_move_out_invoice_type').id)"/>
</t>
addons/web/views/report_templates.xml
+7 -5
View File
@@ -125,7 +125,7 @@
<!-- External layouts styles -->
<template id="address_layout">
<t t-set="colclass" t-value="('col-md-5' if report_type == 'html' else 'col-5') + ' ml-auto'"/>
<t t-set="colclass" t-value="('col-md-5' if report_type == 'html' else 'col-5') + ' ml-auto mt-3'"/>
<t t-if="address">
<div class="address row">
<t t-if="information_block">
@@ -298,10 +298,12 @@
<div class="footer o_standard_footer">
<div class="text-center" style="border-top: 1px solid black;">
<ul class="list-inline mb4">
<li t-if="company.phone" class="list-inline-item">Phone: <span t-field="company.phone"/></li>
<li t-if="company.email" class="list-inline-item">Email: <span t-field="company.email"/></li>
<li t-if="company.website" class="list-inline-item">Web: <span t-field="company.website"/></li>
<li t-if="company.vat" class="list-inline-item"><t t-esc="company.country_id.vat_label or 'Tax ID'"/>: <span t-field="company.vat"/></li>
<!-- using the list-inline-item class from bootstrap causes weird behaviours in pdf report
adding d-inline class fixes the problem-->
<li t-if="company.phone" class="list-inline-item d-inline">Phone: <span t-field="company.phone"/></li>
<li t-if="company.email" class="list-inline-item d-inline">Email: <span t-field="company.email"/></li>
<li t-if="company.website" class="list-inline-item d-inline">Web: <span t-field="company.website"/></li>
<li t-if="company.vat" class="list-inline-item d-inline"><t t-esc="company.country_id.vat_label or 'Tax ID'"/>: <span t-field="company.vat"/></li>
</ul>
<div name="financial_infos">