From 6b490ef24732a706550783184251aa99238fe3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 11 May 2017 11:23:35 +0200
Subject: [PATCH] [FIX] base, report: fix choose report template broken by 'new
report'
Report module has been cleaned and moved into base at https://github.com/odoo/odoo/commit/e80238042c9d93d492ea8b06b0041aced0d81dcd.
However there are leftover references to report module. This crashes
the template choice feature.
---
.../web/static/src/less/layout_background.less | 2 +-
odoo/addons/base/res/res_company_view.xml | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/addons/web/static/src/less/layout_background.less b/addons/web/static/src/less/layout_background.less
index f00fec6b33e4..7ff90a68921c 100644
--- a/addons/web/static/src/less/layout_background.less
+++ b/addons/web/static/src/less/layout_background.less
@@ -30,7 +30,7 @@
}
}
.o_report_layout_background {
- background-image: url(/report/static/src/img/bg_background_template.jpg);
+ background-image: url(/base/static/img/bg_background_template.jpg);
background-size: cover;
background-position: bottom center;
background-repeat: no-repeat;
diff --git a/odoo/addons/base/res/res_company_view.xml b/odoo/addons/base/res/res_company_view.xml
index e9cdcfcf1766..317e0cf73aef 100644
--- a/odoo/addons/base/res/res_company_view.xml
+++ b/odoo/addons/base/res/res_company_view.xml
@@ -140,24 +140,24 @@
<div class="row mt16">
<div class="col-xs-3 text-center">
<button type="object" name="set_report_template" context="{'report_template': 'background'}">
- <img src="/report/static/src/img/preview_background.png" class="img img-responsive img-thumbnail" alt="Preview Background Template"/>
+ <img src="/base/static/img/preview_background.png" class="img img-responsive img-thumbnail" alt="Preview Background Template"/>
</button>
- <a href="/report/static/src/pdf/preview_background.pdf" target="_blank">preview</a>
+ <a href="/base/static/pdf/preview_background.pdf" target="_blank">preview</a>
</div><div class="col-xs-3 text-center">
<button type="object" name="set_report_template" context="{'report_template': 'boxed'}">
- <img src="/report/static/src/img/preview_boxed.png" class="img img-responsive img-thumbnail" alt="Preview Boxed Template"/>
+ <img src="/base/static/img/preview_boxed.png" class="img img-responsive img-thumbnail" alt="Preview Boxed Template"/>
</button>
- <a href="/report/static/src/pdf/preview_boxed.pdf" target="_blank">preview</a>
+ <a href="/base/static/pdf/preview_boxed.pdf" target="_blank">preview</a>
</div><div class="col-xs-3 text-center">
<button type="object" name="set_report_template" context="{'report_template': 'clean'}">
- <img src="/report/static/src/img/preview_clean.png" class="img img-responsive img-thumbnail" alt="Preview Clean Template"/>
+ <img src="/base/static/img/preview_clean.png" class="img img-responsive img-thumbnail" alt="Preview Clean Template"/>
</button>
- <a href="/report/static/src/pdf/preview_clean.pdf" target="_blank">preview</a>
+ <a href="/base/static/src/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="/report/static/src/img/preview_standard.png" class="img img-responsive img-thumbnail" alt="Preview Minimalist Template"/>
+ <img src="/base/static/img/preview_standard.png" class="img img-responsive img-thumbnail" alt="Preview Minimalist Template"/>
</button>
- <a href="/report/static/src/pdf/preview_standard.pdf" target="_blank">preview</a>
+ <a href="/base/static/pdf/preview_standard.pdf" target="_blank">preview</a>
</div>
</div>
<footer>
--
GitLab