verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge branch 'dev' into test
gitea/salix/test This commit looks good Details

This commit is contained in:
Gerard 2019-02-20 09:00:40 +01:00
parent e3e9998243 031aeae950
commit 3e2dd9cd3a
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/core/components/check/style.scss
View File

@ -18,4 +18,8 @@ vn-check {
md-checkbox { md-checkbox {
margin-bottom: 0 margin-bottom: 0
} }
md-checkbox .md-label {
margin-bottom: .5em;
}
} }

2
print/lib/reportEngine.js
View File

@ -107,7 +107,7 @@ module.exports = {
format: 'A4', format: 'A4',
border: '1.5cm', border: '1.5cm',
footer: { footer: {
height: '60px', height: '55px',
} }
}; };

2
print/report/email-header/locale.js
View File

@ -1,5 +1,5 @@
module.exports = { module.exports = {
messages: { messages: {
es: {clientName: 'Nombre cliente'}, es: {},
}, },
}; };

3
print/report/rpt-delivery-note/index.html
View File

@ -5,7 +5,7 @@
<!-- Header component --> <!-- Header component -->
<report-header :locale="ticket.locale"></report-header> <report-header :locale="ticket.locale"></report-header>
<!-- End header component --> <!-- End header component -->
<section class="main" style="margin-bottom:100px"> <section class="main">
<section class="columns"> <section class="columns">
<section class="size50"> <section class="size50">
<section class="size75"> <section class="size75">
@ -185,7 +185,6 @@
</section> </section>
</section> </section>
</section> </section>
</section> </section>
<!-- Footer component --> <!-- Footer component -->
<report-footer id="pageFooter" <report-footer id="pageFooter"