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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2021-07-02 13:44:44 +02:00
parent 249f5074df 4849355c9b
commit 057d138991
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/entry/front/buy/index/index.html
View File

@ -2,13 +2,16 @@
auto-load="true" auto-load="true"
vn-id="model" vn-id="model"
url="Entries/{{$ctrl.$params.id}}/getBuys" url="Entries/{{$ctrl.$params.id}}/getBuys"
data="$ctrl.buys"> data="$ctrl.buys"
limit="20">
</vn-crud-model> </vn-crud-model>
<vn-watcher <vn-watcher
vn-id="watcher" vn-id="watcher"
data="$ctrl.buys"> data="$ctrl.buys">
</vn-watcher> </vn-watcher>
<div class="vn-w-xl"> <vn-data-viewer
model="model"
class="vn-w-xl">
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<div class="tableWrapper"> <div class="tableWrapper">
<vn-horizontal class="header"> <vn-horizontal class="header">
@ -191,7 +194,7 @@
</div> </div>
</div> </div>
</vn-card> </vn-card>
</div> </vn-data-viewer>
<div fixed-bottom-right> <div fixed-bottom-right>
<vn-vertical style="align-items: center;"> <vn-vertical style="align-items: center;">
<a ui-sref="entry.card.buy.import" <a ui-sref="entry.card.buy.import"

4
modules/item/front/diary/index.html
View File

@ -42,7 +42,7 @@
<vn-tbody> <vn-tbody>
<vn-tr <vn-tr
ng-class="::{ ng-class="::{
'isIn': sale.in, 'isIn': sale.invalue,
'balanceNegative': sale.balance < 0}" 'balanceNegative': sale.balance < 0}"
ng-repeat="sale in sales" ng-repeat="sale in sales"
vn-repeat-last vn-repeat-last
@ -76,7 +76,7 @@
</span> </span>
</span> </span>
</vn-td> </vn-td>
<vn-td number class="in">{{::sale.in | dashIfEmpty}}</vn-td> <vn-td number class="in">{{::sale.invalue | dashIfEmpty}}</vn-td>
<vn-td number>{{::sale.out | dashIfEmpty}}</vn-td> <vn-td number>{{::sale.out | dashIfEmpty}}</vn-td>
<vn-td number class="balance"> <vn-td number class="balance">
<span class="chip balanceSpan" <span class="chip balanceSpan"