verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 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 +23 -10
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d908fd5f9 - Show all commits

5
print/templates/reports/entry-order/assets/css/style.css
View File

@ -23,3 +23,8 @@ h3 {
.column-oriented td{ .column-oriented td{
padding: 5px padding: 5px
} }
[row] {
display: flex;
column-gap: 5px;
}

25
print/templates/reports/entry-order/entry-order.html
View File

@ -41,12 +41,13 @@
<table class="column-oriented vn-mt-ml border-collapse"> <table class="column-oriented vn-mt-ml border-collapse">
<thead> <thead>
<tr> <tr>
<th width="5%">{{$t('reference')}}</th> <th width="5%">{{$t('code')}}</th>
<th class="number">{{$t('boxes')}}</th> <th class="number">{{$t('boxes')}}</th>
<th width="1px" class="number"></th> <th width="1px" class="number"></th>
<th class="number">{{$t('packing')}}</th> <th class="number">{{$t('packing')}}</th>
<th width="25%">{{$t('concept')}}</th> <th width="5%">{{$t('concept')}}</th>
<th width="45%">{{$t('tags')}}</th> <th width="20%">{{$t('reference')}}</th>
<th width="20%">{{$t('tags')}}</th>
<th width="5%" class="number">{{$t('quantity')}}</th> <th width="5%" class="number">{{$t('quantity')}}</th>
<th width="1px" class="number"></th> <th width="1px" class="number"></th>
<th width="5%" class="number">{{$t('price')}}</th> <th width="5%" class="number">{{$t('price')}}</th>
@ -56,15 +57,20 @@
</thead> </thead>
<tbody v-for="buy in buys"> <tbody v-for="buy in buys">
<tr> <tr>
<td width="5%">{{buy.comment}}</td> <td width="5%">{{buy.itemFk}}</td>
<td class="number">{{buy.stickers}}</td> <td class="number">{{buy.stickers}}</td>
<td width="1px" class="number">x</td> <td width="1px" class="number">x</td>
<td class="number align-left">{{buy.packing}}</td> <td class="number align-left">{{buy.packing}}</td>
<td width="25%" class="nowrap">{{buy.name}}</td> <td width="5%" class="nowrap">{{buy.name}}</td>
<td width="45%" class="font light-gray tags"> <td width="20%">referencia de prueba</td>
<span v-if="buy.value5" class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}}</span> <td width="20%" class="font light-gray tags" row>
<span v-if="buy.value6" class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}}</span> <div>
<span v-if="buy.value7" class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}}</span> <div class="nowrap">Color<strong>→ Lavanda</strong></div>
<div class="nowrap">Altura<strong>→ 100cm</strong></div>
</div>
<div>
<span class="nowrap">label<strong>→ valor</strong></span>
</div>
</td> </td>
<td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td> <td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
<td width="1px" class="number">x</td> <td width="1px" class="number">x</td>
@ -83,6 +89,7 @@
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
<td class="number">{{getTotalBy('quantity') | number($i18n.locale)}}</td> <td class="number">{{getTotalBy('quantity') | number($i18n.locale)}}</td>
<td></td> <td></td>
<td></td> <td></td>

3
print/templates/reports/entry-order/locale/es.yml
View File

@ -16,4 +16,5 @@ entry: Entrada {0}
supplierData: Datos del proveedor supplierData: Datos del proveedor
notes: Notas notes: Notas
reference: Referencia reference: Referencia
tags: Tags tags: Etiquetas
code: Código