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 +9 -2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4375b2505 - Show all commits

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

@ -67,9 +67,14 @@
<div>
<div class="nowrap">Color<strong>→ Lavanda</strong></div>
<div class="nowrap">Altura<strong>→ 100cm</strong></div>
<div class="nowrap" v-if="buy.value5">{{buy.tag5}}<strong>→ {{buy.value5}}</strong></div>
<div class="nowrap" v-if="buy.value6">{{buy.tag6}}<strong>→ {{buy.value6}}</strong></div>
</div>
<div>
<span class="nowrap">label<strong>→ valor</strong></span>
<div class="nowrap">Color<strong>→ Lavanda</strong></div>
<div class="nowrap">Altura<strong>→ 100cm</strong></div>
<div class="nowrap" v-if="buy.value7">{{buy.tag7}}<strong>→ {{buy.value7}}</strong></div>
<div class="nowrap" v-if="buy.value8">{{buy.tag8}}<strong>→ {{buy.value8}}</strong></div>
</div>
</td>
<td width="5%" class="number">{{buy.quantity | number($i18n.locale)}}</td>

4
print/templates/reports/entry-order/sql/buys.sql
View File

@ -10,7 +10,9 @@ SELECT b.itemFk,
i.tag6,
i.value6,
i.tag7,
i.value7
i.value7,
i.tag8,
i.value8
FROM buy b
JOIN item i ON i.id = b.itemFk
LEFT JOIN item i2 ON i2.id = b.itemOriginalFk