Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Javi Gallego 2018-09-11 13:56:45 +02:00
commit 2e94ab28de
1 changed files with 4 additions and 4 deletions

View File

@ -34,11 +34,11 @@
</vn-tr>
</vn-thead>
<vn-tbody>
<vn-tr ng-class="{'warning': $ctrl.isToday(sale.date)}"
<vn-tr ng-class="::{'warning': $ctrl.isToday(sale.date)}"
ng-repeat="sale in sales" vn-repeat-last on-last="$ctrl.scrollToActive()">
<vn-td>{{::sale.date | date:'dd/MM/yyyy HH:mm' }}</vn-td>
<vn-td number>
<span ng-class="{'link pointer': sale.isTicket}"
<span ng-class="::{'link pointer': sale.isTicket}"
ng-click="$ctrl.showDescriptor($event, sale)">
{{::sale.origin | dashIfEmpty}}
</span>
@ -46,9 +46,9 @@
<vn-td>{{::sale.stateName | dashIfEmpty}}</vn-td>
<vn-td>{{::sale.reference | dashIfEmpty}}</vn-td>
<vn-td>
<span ng-class="{'link pointer': sale.isTicket}"
<span ng-class="::{'link pointer': sale.isTicket}"
ng-click="$ctrl.showClientDescriptor($event, sale)">
{{sale.name | dashIfEmpty}}
{{::sale.name | dashIfEmpty}}
</span>
</vn-td>
<vn-td number>{{::sale.in | dashIfEmpty}}</vn-td>