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

[FIX] l10n_ch: use OCRB font

Browse Source 
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>
This commit is contained in:
wan
2019-12-05 16:16:30 +00:00
parent 699890d3f0
commit 33edd63510
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_ch/static/src/font/ocrb.ttf
BIN
View File
Binary file not shown.
addons/l10n_ch/static/src/scss/report_isr.scss
+12 -7
View File
@@ -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 {
}
}
}
}
addons/l10n_ch/static/src/scss/report_swissqr.css
+6 -1
View File
@@ -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;
}