summaryrefslogtreecommitdiff
path: root/addons/l10n_ch
diff options
context:
space:
mode:
authorwan <wan@odoo.com>2019-12-05 16:10:11 +0000
committerwan <wan@odoo.com>2019-12-05 16:16:30 +0000
commit33edd63510c68a04ebd3608837fea4ec37b63eca (patch)
tree80e18db26cc33a7f15dda8f8555b52f9929a1576 /addons/l10n_ch
parent699890d3f0b9d5e4421ffb9b423a8dfa67ad469e (diff)
[FIX] l10n_ch: use OCRB font
OPW 2151580 There is a needed font for the swiss IRS report: OCR-B. This commit ensures it is used. closes odoo/odoo#41466 X-original-commit: 8f4a390cf3150a65dcdad2687eee1011b32f4fc7 Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
Diffstat (limited to 'addons/l10n_ch')
-rw-r--r--addons/l10n_ch/static/src/font/ocrb.ttfbin0 -> 63205 bytes
-rw-r--r--addons/l10n_ch/static/src/scss/report_isr.scss19
-rw-r--r--addons/l10n_ch/static/src/scss/report_swissqr.css7
3 files changed, 18 insertions, 8 deletions
diff --git a/addons/l10n_ch/static/src/font/ocrb.ttf b/addons/l10n_ch/static/src/font/ocrb.ttf
new file mode 100644
index 00000000000..df1d0602e9e
--- /dev/null
+++ b/addons/l10n_ch/static/src/font/ocrb.ttf
Binary files differ
diff --git a/addons/l10n_ch/static/src/scss/report_isr.scss b/addons/l10n_ch/static/src/scss/report_isr.scss
index 364c085af5c..b3c42796180 100644
--- a/addons/l10n_ch/static/src/scss/report_isr.scss
+++ b/addons/l10n_ch/static/src/scss/report_isr.scss
@@ -1,4 +1,9 @@
-body.l10n_ch_isr {
+@font-face {
+ font-family: ocrb;
+ src: url('../font/ocrb.ttf') format('truetype');
+}
+
+.l10n_ch_isr {
/*
all elements are positionned for A4 format (210 x 297mm) but the viewport
is bigger than this, hence we zoom the whole page to be bigger than the viewport
@@ -11,11 +16,11 @@ body.l10n_ch_isr {
/* display dummy check bacground in html rendering to help see the end result */
#isr {
- background: url(/l10n_ch/static/src/img/background_virgin_isr.png) bottom no-repeat;
+ background: url(../img/background_virgin_isr.png) bottom no-repeat;
background-size: 100%;
&.isr-print-bank {
- background-image: url(/l10n_ch/static/src/img/background_virgin_isr_bank.png);
+ background-image: url(../img/background_virgin_isr_bank.png);
}
}
}
@@ -31,9 +36,8 @@ body.l10n_ch_isr {
background: none;
min-height: 0;
}
-}
-body.l10n_ch_isr #isr {
+#isr {
height: 106mm;
width: 210mm;
@@ -43,7 +47,7 @@ body.l10n_ch_isr #isr {
left: 0;
overflow: hidden;
- font-family: OCRB, Courier, monospace;
+ font-family: ocrb;
line-height: 0.16in;
font-size: 10pt;
@@ -186,7 +190,7 @@ body.l10n_ch_isr #isr {
bottom: 0.667in;
/* Positioning is set for OCRB of Tsukurimashou Font Family */
- font-family: OCRB, Courier, monospace;
+ font-family: ocrb;
font-size: 10pt;
line-height: 0.1in;
@@ -201,3 +205,4 @@ body.l10n_ch_isr #isr {
}
}
}
+}
diff --git a/addons/l10n_ch/static/src/scss/report_swissqr.css b/addons/l10n_ch/static/src/scss/report_swissqr.css
index 9626c958887..a4d4b213552 100644
--- a/addons/l10n_ch/static/src/scss/report_swissqr.css
+++ b/addons/l10n_ch/static/src/scss/report_swissqr.css
@@ -1,3 +1,8 @@
+@font-face {
+ font-family: ocrb;
+ src: url('../img/ocrb.ttf') format('truetype');
+}
+
.swissqr_content {
page-break-before: always;
}
@@ -32,7 +37,7 @@
}
.swissqr_text{
- font-family: OCR-B, Arial, Frutiger, Helvetica;
+ font-family: ocrb, Arial, Frutiger, Helvetica;
color: black;
}