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

8144-devToTest_2448 #3216

Merged
alexm merged 256 commits from 8144-devToTest_2448 into test 2024-11-19 07:36:04 +00:00
Conversation 0 Commits 256 Files Changed 376 +24 -21
6 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b1a295dca4 - Show all commits

15
print/templates/reports/item-label-barcode/assets/css/style.css
View File

@ -1,6 +1,7 @@
html { html {
font-family: "Roboto", "Helvetica", "Arial", sans-serif; font-family: "Roboto", "Helvetica", "Arial", sans-serif;
margin-top: -7px; margin-top: -9px;
margin-left: -6px;
} }
table { table {
width: 100%; width: 100%;
@ -51,20 +52,20 @@ td {
max-height: 50px; max-height: 50px;
} }
.md-height { .md-height {
height: 60px; height: 75px;
max-height: 60px; max-height: 75px;
} }
.sm-width { .sm-width {
width: 60px; width: 60px;
max-width: 60px; max-width: 60px;
} }
.md-width { .md-width {
width: 120px; width: 125px;
max-width: 120px; max-width: 125px;
} }
.lg-width { .lg-width {
width: 400px; width: 380px;
max-width: 400px; max-width: 380px;
} }
.overflow-multiline { .overflow-multiline {
max-height: inherit; max-height: inherit;

2
print/templates/reports/item-label-barcode/item-label-barcode.html
View File

@ -8,7 +8,7 @@
{{item.item}} {{item.item}}
</div> </div>
</td> </td>
<td colspan="2" class="xl-txt bold center black-bg md-height"> <td colspan="2" class="xl-txt bold center black-bg md-height md-width">
<div class="overflow-line"> <div class="overflow-line">
{{item.size}} {{item.size}}
</div> </div>

2
print/templates/reports/item-label-barcode/item-label-barcode.js
View File

@ -29,7 +29,7 @@ module.exports = {
xmlDocument: document, xmlDocument: document,
format: 'code128', format: 'code128',
displayValue: false, displayValue: false,
width: 3.9, width: 3.8,
height: 85, height: 85,
margin: 0 margin: 0
}); });

4
print/templates/reports/item-label-barcode/options.json
View File

@ -1,9 +1,9 @@
{ {
"width": "10.4cm", "width": "10.4cm",
"height": "4.8cm", "height": "4.9cm",
"margin": { "margin": {
"top": "0.17cm", "top": "0.17cm",
"right": "0cm", "right": "0.745cm",
"bottom": "0cm", "bottom": "0cm",
"left": "0cm" "left": "0cm"
}, },

18
print/templates/reports/item-label-qr/assets/css/style.css
View File

@ -1,6 +1,7 @@
html { html {
font-family: "Roboto", "Helvetica", "Arial", sans-serif; font-family: "Roboto", "Helvetica", "Arial", sans-serif;
margin-top: -7px; margin-top: -7px;
margin-left: -6px;
} }
.leftTable { .leftTable {
width: 47%; width: 47%;
@ -9,6 +10,7 @@ html {
text-align: center; text-align: center;
} }
.leftTable img { .leftTable img {
margin-top: 3px;
width: 110px; width: 110px;
} }
.rightTable { .rightTable {
@ -51,24 +53,24 @@ html {
padding: 7px; padding: 7px;
} }
.md-height { .md-height {
height: 60px; height: 68px;
max-height: 60px; max-height: 68px;
} }
.xs-width { .xs-width {
width: 60px; width: 60px;
max-width: 60px; max-width: 60px;
} }
.sm-width { .sm-width {
width: 140px; width: 130px;
max-width: 140px; max-width: 130px;
} }
.md-width { .md-width {
width: 200px; width: 190px;
max-width: 200px; max-width: 190px;
} }
.lg-width { .lg-width {
width: 270px; width: 240px;
max-width: 270px; max-width: 240px;
} }
.overflow-multiline { .overflow-multiline {
max-height: inherit; max-height: inherit;

4
print/templates/reports/item-label-qr/options.json
View File

@ -1,9 +1,9 @@
{ {
"width": "10.4cm", "width": "10.4cm",
"height": "4.8cm", "height": "4.9cm",
"margin": { "margin": {
"top": "0.17cm", "top": "0.17cm",
"right": "0cm", "right": "0.6cm",
"bottom": "0cm", "bottom": "0cm",
"left": "0cm" "left": "0cm"
}, },