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

closes 4732 etiquetas con QR para previa y item #1163

Merged
pau merged 35 commits from 4732-previa-label into dev 2023-01-18 08:26:11 +00:00
Conversation 2 Commits 35 Files Changed 15 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d41269bbbe - Show all commits

2
db/dump/fixtures.sql
View File

@ -1206,7 +1206,7 @@ INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceT
(7, NULL, 'Ancho de la base', 1, 1, NULL, 'mm',NULL, NULL), (7, NULL, 'Ancho de la base', 1, 1, NULL, 'mm',NULL, NULL),
(23, 'stems', 'Tallos', 1, 1, NULL, NULL, NULL, 'stems'), (23, 'stems', 'Tallos', 1, 1, NULL, NULL, NULL, 'stems'),
(27, NULL, 'Longitud(cm)', 1, 1, NULL, 'cm', NULL, NULL), (27, NULL, 'Longitud(cm)', 1, 1, NULL, 'cm', NULL, NULL),
(36, NULL, 'Proveedor', 1, 0, NULL, NULL, NULL, NULL), (36, 'producer', 'Proveedor', 1, 0, NULL, NULL, NULL, 'producer'),
(56, NULL, 'Genero', 1, 0, NULL, NULL, NULL, NULL), (56, NULL, 'Genero', 1, 0, NULL, NULL, NULL, NULL),
(58, NULL, 'Variedad', 1, 0, NULL, NULL, NULL, NULL), (58, NULL, 'Variedad', 1, 0, NULL, NULL, NULL, NULL),
(67, 'category', 'Categoria', 1, 0, NULL, NULL, NULL, NULL), (67, 'category', 'Categoria', 1, 0, NULL, NULL, NULL, NULL),

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

@ -12,7 +12,7 @@
<div class="data"> <div class="data">
<div class="header">{{item.name}}</div> <div class="header">{{item.name}}</div>
<div class="color">{{tags.color}}</div> <div class="color">{{tags.color}}</div>
<div class="producer">{{tags.provider}}</div> <div class="producer">{{tags.producer}}</div>
<div class="details"> <div class="details">
<div class="package"> <div class="package">
<div class="packing">{{packing()}}</div> <div class="packing">{{packing()}}</div>