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

2019-08-12 16:58:47 +02:00 · 2019-08-12 16:58:47 +02:00 · 0bc2f9394f
parent b2b4269354 f05f3a3df7
commit 0bc2f9394f
3 changed files with 6 additions and 2 deletions
--- a/modules/claim/front/action/index.html
+++ b/modules/claim/front/action/index.html
@ -18,11 +18,13 @@
                <vn-tool-bar margin-medium-bottom>
                    <vn-button
                        label="Import claim" 
-                        vn-http-click="$ctrl.importToNewRefundTicket()"
+                        disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
+                        vn-http-click="$ctrl.importToNewRefundTicket()"p
                        vn-tooltip="Imports claim details">
                    </vn-button>
                    <vn-button
                        label="Import ticket" 
+                        disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
                        ng-click="$ctrl.showLastTickets($event)"
                        vn-tooltip="Imports ticket lines">
                    </vn-button>
--- a/modules/order/front/catalog/locale/es.yml
+++ b/modules/order/front/catalog/locale/es.yml
@ -0,0 +1 @@
+Order created: Orden creada
--- a/modules/order/front/prices-popover/locale/es.yml
+++ b/modules/order/front/prices-popover/locale/es.yml
@ -1,3 +1,4 @@
 Last entries: Últimas entradas
 Qty.: Cant.
-Wrong quantity: Cantidad errónea
+Wrong quantity: Cantidad errónea
+First you must add some quantity: Primero debes agregar alguna cantidad