Merge branch 'test' into dev

2019-02-22 08:18:03 +01:00 · 2019-02-22 08:18:03 +01:00 · 59e28e4ea4
parent d722df86cf f1afe16c9e
commit 59e28e4ea4
2 changed files with 1 additions and 2 deletions
--- a/front/core/directives/uvc.html
+++ b/front/core/directives/uvc.html
@ -2,7 +2,6 @@
    <div style="position: absolute; top: 0; left: 0; padding: .3em; z-index: 1">
        <vn-icon-button
            icon="menu"
-            style="font-size: .4em;"
            ng-click="$ctrl.showUvc($event)">
        </vn-icon-button>
        <vn-dialog
--- a/modules/order/front/search-panel/locale/es.yml
+++ b/modules/order/front/search-panel/locale/es.yml
@ -1,4 +1,4 @@
-Order id: Id ticket
+Order id: Id pedido
 Client id: Id cliente
 From landed: Desde f. entrega
 To landed: Hasta f. entrega