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

WIP: feat: refs #6583 add new opt in where builder #3162

Draft
jorgep wants to merge 9 commits from 6583-addOnlyDestination into dev
pull from: 6583-addOnlyDestination
merge into: verdnatura:dev
Conversation 0 Commits 9 Files Changed 2 +22 -27
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2f3efa15ba - Show all commits

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

@ -17,9 +17,4 @@ h3 {
.tags { .tags {
font-size: 10px; font-size: 10px;
margin: 0; margin: 0;
}
.column-oriented th,
.column-oriented td{
padding: 5px
} }

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

@ -41,36 +41,36 @@
<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 class="number">{{$t('boxes')}}</th> <th class="number">{{$t('boxes')}}</th>
<th width="1px" class="number"></th> <th width="5%" class="number"></th>
<th class="number">{{$t('packing')}}</th> <th class="number">{{$t('packing')}}</th>
<th width="25%">{{$t('concept')}}</th> <th width="40%">{{$t('concept')}}</th>
<th width="45%">{{$t('tags')}}</th> <th width="10%">{{$t('reference')}}</th>
<th width="5%" class="number">{{$t('quantity')}}</th> <th width="10%">{{$t('tags')}}</th>
<th width="1px" class="number"></th> <th width="10%" class="number">{{$t('quantity')}}</th>
<th width="5%" class="number">{{$t('price')}}</th> <th width="5%" class="number"></th>
<th width="1px" class="number"></th> <th width="15%" class="number">{{$t('price')}}</th>
<th width="5%" class="number">{{$t('amount')}}</th> <th width="5%" class="number"></th>
<th width="15%" class="number">{{$t('amount')}}</th>
</tr> </tr>
</thead> </thead>
<tbody v-for="buy in buys"> <tbody v-for="buy in buys">
<tr> <tr>
<td width="5%">{{buy.comment}}</td>
<td class="number">{{buy.stickers}}</td> <td class="number">{{buy.stickers}}</td>
<td width="1px" class="number">x</td> <td width="5%" class="number">x</td>
<td class="number align-left">{{buy.packing}}</td> <td class="number">{{buy.packing}}</td>
<td width="25%" class="nowrap">{{buy.name}}</td> <td width="40%" class="nowrap">{{buy.name}}</td>
<td width="45%" class="font light-gray tags"> <td width="10%">{{buy.comment}}</td>
<span class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}}</span> <td width="10%" class="font light-gray tags">
<span class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}}</span> <span v-if="buy.value5" class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}} </span>
<span class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}}</span> <span v-if="buy.value6" class="nowrap"><strong>{{buy.tag6}} → </strong>{{buy.value6}} </span>
<span v-if="buy.value7" class="nowrap"><strong>{{buy.tag7}} → </strong>{{buy.value7}} </span>
</td> </td>
<td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td> <td width="10%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
<td width="1px" class="number">x</td> <td width="5%" class="number">x</td>
<td width="5%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td> <td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
<td width="1px" class="number">=</td> <td width="5%" class="number">=</td>
<td width="5%" class="number align-left"> <td width="15%" class="number">
{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}} {{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}
</td> </td>
</tr> </tr>