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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2019-08-12 16:58:47 +02:00
parent b2b4269354 f05f3a3df7
commit 0bc2f9394f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/claim/front/action/index.html
View File

@ -18,11 +18,13 @@
<vn-tool-bar margin-medium-bottom> <vn-tool-bar margin-medium-bottom>
<vn-button <vn-button
label="Import claim" 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-tooltip="Imports claim details">
</vn-button> </vn-button>
<vn-button <vn-button
label="Import ticket" label="Import ticket"
disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedState"
ng-click="$ctrl.showLastTickets($event)" ng-click="$ctrl.showLastTickets($event)"
vn-tooltip="Imports ticket lines"> vn-tooltip="Imports ticket lines">
</vn-button> </vn-button>

1
modules/order/front/catalog/locale/es.yml Normal file
View File

@ -0,0 +1 @@
Order created: Orden creada

1
modules/order/front/prices-popover/locale/es.yml
View File

@ -1,3 +1,4 @@
Last entries: Últimas entradas Last entries: Últimas entradas
Qty.: Cant. Qty.: Cant.
Wrong quantity: Cantidad errónea Wrong quantity: Cantidad errónea
First you must add some quantity: Primero debes agregar alguna cantidad